Messages in this thread | | | Date | Fri, 10 Jan 2020 15:32:07 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the usb-gadget tree with Linus' tree |
| |
Hi all,
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.
-- Cheers, Stephen Rothwell [unhandled content-type:application/pgp-signature] | |