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

2014-12-02 Thread Greg KH
On Fri, Nov 28, 2014 at 05:32:46PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > drivers/usb/chipidea/core.c between commit 5bc879a6a271 ("usb: > chipidea: drop owner assignment from platform_drivers") from the > driver-core tree and com

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

2014-11-27 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/chipidea/core.c between commit 5bc879a6a271 ("usb: chipidea: drop owner assignment from platform_drivers") from the driver-core tree and commit 8076932ff2fc ("usb: chipidea: add system power management support") from t

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

2013-02-17 Thread Greg KH
On Mon, Feb 18, 2013 at 03:32:42PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > drivers/usb/host/ehci-vt8500.c between commit 148e11349b0c ("usb: Convert > to devm_ioremap_resource()") from the driver-core tree and commit > d57ada0c37ec

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

2013-02-17 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/host/ehci-vt8500.c between commit 148e11349b0c ("usb: Convert to devm_ioremap_resource()") from the driver-core tree and commit d57ada0c37ec ("USB: EHCI: make ehci-vt8500 a separate driver") from the usb tree. I fixed

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

2013-01-29 Thread Greg KH
On Mon, Jan 28, 2013 at 09:23:09PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > drivers/usb/musb/omap2430.c between commit 148e11349b0c ("usb: Convert to > devm_ioremap_resource()") from the driver-core tree and commit > ca784be36cc7 ("

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

2013-01-28 Thread Felipe Balbi
On Mon, Jan 28, 2013 at 09:35:35PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the usb tree got a conflict in > drivers/usb/phy/omap-usb2.c between commit 148e11349b0c ("usb: Convert to > devm_ioremap_resource()") from the tree and commit ca784be36cc7 ("usb: > start

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

2013-01-28 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/phy/omap-usb2.c between commit 148e11349b0c ("usb: Convert to devm_ioremap_resource()") from the tree and commit ca784be36cc7 ("usb: start using the control module driver") from the usb tree. I fixed it up (I wasn't

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

2013-01-28 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/musb/omap2430.c between commit 148e11349b0c ("usb: Convert to devm_ioremap_resource()") from the driver-core tree and commit ca784be36cc7 ("usb: start using the control module driver") from the usb tree. I fixed it up