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