RE: linux-next: manual merge of the usb-gadget tree with the usb.current tree

2015-01-16 Thread Kaukab, Yousaf
Hi, > -Original Message- > From: Stephen Rothwell [mailto:s...@canb.auug.org.au] > Sent: Friday, January 16, 2015 7:24 AM > To: Felipe Balbi; Greg KH > Cc: linux-n...@vger.kernel.org; linux-kernel@vger.kernel.org; Robert Baldyga; > Kaukab, Yousaf > Subject: linux-next: manual merge of the u

Re: linux-next: manual merge of the usb-gadget tree with the usb.current tree

2014-09-08 Thread Felipe Balbi
On Mon, Sep 08, 2014 at 05:02:12PM +1000, Stephen Rothwell wrote: > Hi Felipe, > > Today's linux-next merge of the usb-gadget tree got a conflict in > Documentation/devicetree/bindings/usb/mxs-phy.txt between commit > 36687e305651 ("doc: dt: mxs-phy: add compatible string for > imx6sx-usbphy") fro

Re: linux-next: manual merge of the usb-gadget tree with the usb.current tree

2013-07-29 Thread Felipe Balbi
Hi, On Tue, Jul 30, 2013 at 02:08:10PM +1000, Stephen Rothwell wrote: > Hi Felipe, > > Today's linux-next merge of the usb-gadget tree got a conflict in > drivers/usb/gadget/udc-core.c between commit 1894870eb424 ("usb: gadget: > udc-core: fix the typo of udc state attribute") from the usb.curren

Re: linux-next: manual merge of the usb-gadget tree with the usb.current tree

2013-03-21 Thread Felipe Balbi
On Fri, Mar 22, 2013 at 02:31:35PM +1100, Stephen Rothwell wrote: > Hi Felipe, > > Today's linux-next merge of the usb-gadget tree got a conflict in > drivers/usb/gadget/net2280.c between commit 8119b55aed81 ("USB: gadget: > net2280: remove leftover driver->unbind call in error pathway") from the

Re: linux-next: manual merge of the usb-gadget tree with the usb.current tree

2013-03-21 Thread Felipe Balbi
Hi, On Fri, Mar 22, 2013 at 02:28:11PM +1100, Stephen Rothwell wrote: > Hi Felipe, > > Today's linux-next merge of the usb-gadget tree got a conflict in > drivers/usb/gadget/net2272.c between commit eda81bea894e ("usb: gadget: > net2272: finally convert "CONFIG_USB_GADGET_NET2272_DMA"") from the