linux-next: duplicate patch in the usb tree

linux-next: duplicate patch in the usb tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 342 bytes --]

Hi all,

The following commit is also in the imx-mxs tree as a different commit
(but the same patch):

  fcd3f50845be ("arm64: dts: imx8mq: drop usb3-resume-missing-cas from usb")

This is commit

  989e2ee399cd ("arm64: dts: imx8mq: drop usb3-resume-missing-cas from usb")

in the imx-mxs tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patch in the usb tree

[Greg KH]

On Tue, Mar 28, 2023 at 01:11:10PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> The following commit is also in the imx-mxs tree as a different commit
> (but the same patch):
> 
>   fcd3f50845be ("arm64: dts: imx8mq: drop usb3-resume-missing-cas from usb")
> 
> This is commit
> 
>   989e2ee399cd ("arm64: dts: imx8mq: drop usb3-resume-missing-cas from usb")
> 
> in the imx-mxs tree.

Thanks, I can revert this in the imx-mxs tree, but it should be fine
when Linus merges so I doubt that is needed.

thanks,

greg k-h

Re: linux-next: duplicate patch in the usb tree

[Shawn Guo]

On Tue, Mar 28, 2023 at 07:27:54AM +0200, Greg KH wrote:
> On Tue, Mar 28, 2023 at 01:11:10PM +1100, Stephen Rothwell wrote:
> > Hi all,
> > 
> > The following commit is also in the imx-mxs tree as a different commit
> > (but the same patch):
> > 
> >   fcd3f50845be ("arm64: dts: imx8mq: drop usb3-resume-missing-cas from usb")
> > 
> > This is commit
> > 
> >   989e2ee399cd ("arm64: dts: imx8mq: drop usb3-resume-missing-cas from usb")
> > 
> > in the imx-mxs tree.
> 
> Thanks, I can revert this in the imx-mxs tree, but it should be fine
> when Linus merges so I doubt that is needed.

My branch is not stable anyway, so I'm dropping the copy here.

Shawn

Re: linux-next: duplicate patch in the usb tree

[Greg KH]

On Thu, Jun 15, 2023 at 08:42:26AM +0200, Wolfram Sang wrote:
> Hi,
> 
> > The following commit is also in the i2c tree as a different commit
> > (but the same patch):
> 
> thank you for the pointer!
> 
> > 
> >   7b7efc925042 ("usb: typec: ucsi: Mark dGPUs as DEVICE scope")
> > 
> > This is commit
> > 
> >   a7fbfd44c020 ("usb: typec: ucsi: Mark dGPUs as DEVICE scope")
> > 
> > in the ic2 tree.
> 
> Oh, sorry, I didn't get a mail that it was already applied to the
> usb-tree. Maybe I accidently erased it. What is the procedure now? I
> guess I revert the version in the i2c tree?

We can leave both, merges should be simple.

thanks,

greg k-h

Re: linux-next: duplicate patch in the usb tree

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 539 bytes --]

Hi,

> The following commit is also in the i2c tree as a different commit
> (but the same patch):

thank you for the pointer!

> 
>   7b7efc925042 ("usb: typec: ucsi: Mark dGPUs as DEVICE scope")
> 
> This is commit
> 
>   a7fbfd44c020 ("usb: typec: ucsi: Mark dGPUs as DEVICE scope")
> 
> in the ic2 tree.

Oh, sorry, I didn't get a mail that it was already applied to the
usb-tree. Maybe I accidently erased it. What is the procedure now? I
guess I revert the version in the i2c tree?

All the best,

   Wolfram


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

linux-next: duplicate patch in the usb tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 308 bytes --]

Hi all,

The following commit is also in the i2c tree as a different commit
(but the same patch):

  7b7efc925042 ("usb: typec: ucsi: Mark dGPUs as DEVICE scope")

This is commit

  a7fbfd44c020 ("usb: typec: ucsi: Mark dGPUs as DEVICE scope")

in the ic2 tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patch in the usb tree

[Greg KH]

On Wed, Feb 08, 2023 at 12:17:34PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> The following commit is also in the net tree tree as a different commit
> (but the same patch):
> 
>   93fd565919cf ("net: USB: Fix wrong-direction WARNING in plusb.c")
> 
> This is commit
> 
>   811d581194f7 ("net: USB: Fix wrong-direction WARNING in plusb.c")
> 
> in the net tree.

Not a problem, git will merge this properly.

thanks,

greg k-h

linux-next: duplicate patch in the usb tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 321 bytes --]

Hi all,

The following commit is also in the net tree tree as a different commit
(but the same patch):

  93fd565919cf ("net: USB: Fix wrong-direction WARNING in plusb.c")

This is commit

  811d581194f7 ("net: USB: Fix wrong-direction WARNING in plusb.c")

in the net tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: duplicate patch in the usb tree

[Greg KH]

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

Re: linux-next: duplicate patch in the usb tree

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 1373 bytes --]

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.

Thierry

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: linux-next: duplicate patch in the usb tree

[Greg KH]

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?

thanks,

greg k-h

linux-next: duplicate patch in the usb tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 356 bytes --]

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.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]