[lkml]   [2020]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the usb-gadget tree with Linus' tree


Stephen Rothwell <> 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

[unhandled content-type:application/pgp-signature]
 \ /
  Last update: 2020-01-15 07:56    [W:0.048 / U:2.972 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site