lkml.org 
[lkml]   [2014]   [Nov]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the usb-gadget tree with the usb-gadget-fixes tree
On Tue, Nov 11, 2014 at 04:23:22PM +1100, Stephen Rothwell wrote:
> Hi Felipe,
>
> Today's linux-next merge of the usb-gadget tree got a conflict in
> drivers/usb/dwc3/ep0.c between commit 520fe7633692 ("usb: dwc3: ep0:
> fix for dead code") from the usb-gadget-fixes tree and commit
> ccb072de5702 ("usb: dwc3: ep0: trace ep0 TRBs too") from the usb-gadget
> tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

resolution looks good to me. Thank you

--
balbi
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2014-11-11 16:21    [W:0.035 / U:1.632 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site