[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <2023051509-confess-rinse-6fa5@gregkh>
Date: Mon, 15 May 2023 05:50:31 +0200
From: Greg KH <greg@...ah.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
Cc: Krishna Kurapati <quic_kriskura@...cinc.com>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Linux Next Mailing List <linux-next@...r.kernel.org>,
Roger Quadros <rogerq@...nel.org>
Subject: Re: linux-next: manual merge of the usb tree with the usb.current
tree
On Mon, May 15, 2023 at 12:35:24PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the usb tree got a conflict in:
>
> drivers/usb/dwc3/gadget.c
>
> between commit:
>
> c8540870af4c ("usb: dwc3: gadget: Improve dwc3_gadget_suspend() and dwc3_gadget_resume()")
>
> from the usb.current tree and commit:
>
> 813f44d57e19 ("usb: dwc3: gadget: Bail out in pullup if soft reset timeout happens")
>
> from the usb tree.
>
> I fixed it up (I think - see below) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging. You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.
Thanks for the 2 merge fixups, I'll apply them to my tree when the usb
fixes get merged by Linus.
greg k-h
Powered by blists - more mailing lists