[lkml]   [2020]   [Mar]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the usb-gadget tree with the usb tree
On Mon, Mar 16, 2020 at 02:23:09PM +1100, Stephen Rothwell wrote:
> Hi all,
> Today's linux-next merge of the usb-gadget tree got a conflict in:
> drivers/usb/dwc3/dwc3-meson-g12a.c
> between commit:
> bce3052f0c16 ("usb: roles: Provide the switch drivers handle to the switch in the API")
> from the usb tree and commit:
> 1e355f21d3fb ("usb: dwc3: Add Amlogic A1 DWC3 glue")
> from the usb-gadget tree.

Thanks for this, I just hit this issue as I just merged the gadget tree
into mine. I'll queue it up into my tree...


greg k-h

 \ /
  Last update: 2020-03-16 08:26    [W:0.034 / U:0.112 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site