From: Greg KH <greg@kroah•com>
To: Thierry Reding <thierry.reding@gmail•com>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Colin Cross <ccross@android•com>, Olof Johansson <olof@lixom•net>,
Thierry Reding <treding@nvidia•com>,
Jon Hunter <jonathanh@nvidia•com>,
Wayne Chang <waynec@nvidia•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: duplicate patch in the usb tree
Date: Fri, 20 Jan 2023 15:04:26 +0100 [thread overview]
Message-ID: <Y8qfavvwqZyvq4Kw@kroah.com> (raw)
In-Reply-To: <Y8lEhwT3VWEn9w+R@orome>
On Thu, Jan 19, 2023 at 02:24:23PM +0100, Thierry Reding wrote:
> On Thu, Jan 19, 2023 at 01:05:57PM +0100, Greg KH wrote:
> > On Thu, Jan 19, 2023 at 03:26:05PM +1100, Stephen Rothwell wrote:
> > > Hi all,
> > >
> > > The following commit is also in the tegra tree as a different commit
> > > (but the same patch):
> > >
> > > 2648f68bd0ac ("dt-bindings: usb: Add NVIDIA Tegra234 XUSB host controller binding")
> > >
> > > this is commit
> > >
> > > 20cdc1607ea0 ("dt-bindings: usb: Add NVIDIA Tegra234 XUSB host controller binding")
> > >
> > > in the tegra tree.
> >
> > Is that going to be a problem? Git should handle merging that just
> > fine, right?
>
> This one shouldn't be a problem. I can also back this out of the Tegra
> tree. However, I also carry
>
> 6e505dd6804f ("arm64: tegra: Enable XUSB host function on Jetson AGX Orin")
>
> which you picked up as
>
> 1b17df99730a ("arm64: tegra: Enable XUSB host function on Jetson AGX Orin")
>
> That one is a bit problematic because I had to manually apply it on top
> of the Tegra tree because of some rework of the DTS files. I think this
> managed to thoroughly confuse everyone and the version in linux-next is
> now not what it should be.
>
> Is there any chance you could drop it? If not I could back out the DTS
> rework and schedule that for the next release. I'd rather not since I've
> been trying to get that in for a while now, but it's not worth a revert
> in your tree.
Now reverted in my tree. If there's anything else I need to revert,
just let me know.
thanks,
greg k-h
next prev parent reply other threads:[~2023-01-20 14:04 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-19 4:26 linux-next: duplicate patch in the usb tree Stephen Rothwell
2023-01-19 12:05 ` Greg KH
2023-01-19 13:24 ` Thierry Reding
2023-01-20 14:04 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-02-08 1:17 Stephen Rothwell
2023-02-08 7:35 ` Greg KH
2023-03-28 2:11 Stephen Rothwell
2023-03-28 5:27 ` Greg KH
2023-03-28 6:16 ` Shawn Guo
2023-06-15 5:19 Stephen Rothwell
2023-06-15 6:42 ` Wolfram Sang
2023-06-15 6:48 ` Greg KH
2024-08-16 2:37 Stephen Rothwell
2024-08-16 7:23 ` Greg KH
2025-01-08 3:03 Stephen Rothwell
2025-01-08 9:23 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Y8qfavvwqZyvq4Kw@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=ccross@android$(echo .)com \
--cc=jonathanh@nvidia$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=thierry.reding@gmail$(echo .)com \
--cc=treding@nvidia$(echo .)com \
--cc=waynec@nvidia$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox