On 5/15/2023 8:05 AM, 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.
Hi Stephen,
I think the core soft reset has been called two times in the patch
present in this mail. Anything on my end I can do to help.
Regards,
Krishna,
