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
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
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
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
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 ("
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
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
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
8 matches
Mail list logo