Messages in this thread | | | From | Felipe Balbi <> | Subject | Re: linux-next: manual merge of the usb-gadget tree with Linus' tree | Date | Wed, 15 Jan 2020 08:56:48 +0200 |
| |
Hi,
Stephen Rothwell <sfr@canb.auug.org.au> writes: > 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.
I'll rebase on top of Greg's tree
-- balbi [unhandled content-type:application/pgp-signature]
| |