Hi, It's looks like the same issue reported by Stephen Rothwell some days ago. As I know, the first version of patch "usb: cdns3: Add streams support to cadence USB3 DRD driver" was generated by Jayshri based on Felipe repository (https://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git/log/?h=next - branch next). I don't know why, but there is a lack of "usb: cdns3: Fix dequeue implementation.". It's looks like from some reasons Felipe missed this patch in his next repo. The latest version "[PATCH v2] usb: cdns3: Add streams support to cadence USB3 DRD driver" has been created based on top of linux-next.git master branch. In my opinion Felipe has to revert the 4f1fa63a6dc2 ("usb: cdns3: Add streams support to cadence USB3 DRD driver") commit then should apply f616c3bda47e ("usb: cdns3: Fix dequeue implementation.") and again apply new version of "usb: cdns3: Add streams support to cadence USB3 DRD driver" patch . Regards, Pawell > >Hi Stephen, > >On Fri, Jan 10, 2020 at 5:33 AM Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: >> Today's linux-next merge of the usb-gadget tree got a conflict in: >> >> drivers/usb/cdns3/gadget.c >> >> between commit: >> >> f616c3bda47e ("usb: cdns3: Fix dequeue implementation.") >> >> from Linus' tree and commit: >> >> 4f1fa63a6dc2 ("usb: cdns3: Add streams support to cadence USB3 DRD driver") >> >> from the usb-gadget tree. >> >> I have no idea how to handle this, so I just dropped the usb-gadget tree >> for today - it clearly needs to be rebased on Linus' tree anyway (it >> has a few shared patches that are different commits and there are >> further changes to this file in Linus' tree as well. rebasing onto >> (or merging with) v5.5-rc6 may be useful. > >For today's renesas-drivers, I'm using the attached conflict resolution. > >Gr{oetje,eeting}s, > > Geert > >-- >Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx > >In personal conversations with technical people, I call myself a hacker. But >when I'm talking to journalists I just say "programmer" or something like that. > -- Linus Torvalds
