Re: linux-next: manual merge of the usb-gadget tree with the driver-core tree

On Tue, Nov 18, 2014 at 08:24:36AM -0800, Greg KH wrote: > On Tue, Nov 18, 2014 at 09:25:31AM -0600, Felipe Balbi wrote: > > Hi, > > > > On Tue, Nov 18, 2014 at 06:12:22PM +1100, Stephen Rothwell wrote: > > > Hi Felipe, > > > > > > Today's linux-next merge of the usb-gadget tree got a conflict

Re: linux-next: manual merge of the usb-gadget tree with the driver-core tree

On Tue, Nov 18, 2014 at 09:25:31AM -0600, Felipe Balbi wrote: > Hi, > > On Tue, Nov 18, 2014 at 06:12:22PM +1100, Stephen Rothwell wrote: > > Hi Felipe, > > > > Today's linux-next merge of the usb-gadget tree got a conflict in > > drivers/usb/dwc2/gadget.c between commit 7c3e90537b74 ("usb:

Re: linux-next: manual merge of the usb-gadget tree with the driver-core tree

Hi, On Tue, Nov 18, 2014 at 06:12:22PM +1100, Stephen Rothwell wrote: > Hi Felipe, > > Today's linux-next merge of the usb-gadget tree got a conflict in > drivers/usb/dwc2/gadget.c between commit 7c3e90537b74 ("usb: dwc2: drop > owner assignment from platform_drivers") from the driver-core tree

Re: linux-next: manual merge of the usb-gadget tree with the driver-core tree

Hi, On Tue, Nov 18, 2014 at 06:12:22PM +1100, Stephen Rothwell wrote: Hi Felipe, Today's linux-next merge of the usb-gadget tree got a conflict in drivers/usb/dwc2/gadget.c between commit 7c3e90537b74 (usb: dwc2: drop owner assignment from platform_drivers) from the driver-core tree and

Re: linux-next: manual merge of the usb-gadget tree with the driver-core tree

On Tue, Nov 18, 2014 at 09:25:31AM -0600, Felipe Balbi wrote: Hi, On Tue, Nov 18, 2014 at 06:12:22PM +1100, Stephen Rothwell wrote: Hi Felipe, Today's linux-next merge of the usb-gadget tree got a conflict in drivers/usb/dwc2/gadget.c between commit 7c3e90537b74 (usb: dwc2: drop

Re: linux-next: manual merge of the usb-gadget tree with the driver-core tree

On Tue, Nov 18, 2014 at 08:24:36AM -0800, Greg KH wrote: On Tue, Nov 18, 2014 at 09:25:31AM -0600, Felipe Balbi wrote: Hi, On Tue, Nov 18, 2014 at 06:12:22PM +1100, Stephen Rothwell wrote: Hi Felipe, Today's linux-next merge of the usb-gadget tree got a conflict in

linux-next: manual merge of the usb-gadget tree with the driver-core tree

Hi Felipe, Today's linux-next merge of the usb-gadget tree got a conflict in drivers/usb/dwc2/gadget.c between commit 7c3e90537b74 ("usb: dwc2: drop owner assignment from platform_drivers") from the driver-core tree and commit 11b2c3bb ("usb: dwc2: Move gadget probe function into platform

linux-next: manual merge of the usb-gadget tree with the driver-core tree

Hi Felipe, Today's linux-next merge of the usb-gadget tree got a conflict in drivers/usb/dwc2/gadget.c between commit 7c3e90537b74 (usb: dwc2: drop owner assignment from platform_drivers) from the driver-core tree and commit 11b2c3bb (usb: dwc2: Move gadget probe function into platform code)

linux-next: manual merge of the usb-gadget tree with the driver-core tree

Hi Felipe, Today's linux-next merge of the usb-gadget tree got a conflict in drivers/usb/gadget/udc/pxa27x_udc.c between commit 6d3f5f2d895b ("usb: gadget: udc: drop owner assignment from platform_drivers") from the driver-core tree and commit 1803fe15ad54 ("usb: gadget: pxa27x_udc: add

linux-next: manual merge of the usb-gadget tree with the driver-core tree

Hi Felipe, Today's linux-next merge of the usb-gadget tree got a conflict in drivers/usb/gadget/udc/pxa27x_udc.c between commit 6d3f5f2d895b (usb: gadget: udc: drop owner assignment from platform_drivers) from the driver-core tree and commit 1803fe15ad54 (usb: gadget: pxa27x_udc: add devicetree