[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Date: Tue, 11 Nov 2014 08:53:44 -0600
From: Felipe Balbi <balbi@...com>
To: Stephen Rothwell <sfr@...b.auug.org.au>
CC: Felipe Balbi <balbi@...com>, <linux-next@...r.kernel.org>,
<linux-kernel@...r.kernel.org>
Subject: Re: 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
Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)
Powered by blists - more mailing lists