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

2012-09-25 Thread Greg KH
On Mon, Sep 24, 2012 at 04:54:49PM +1000, Stephen Rothwell wrote: > Hi Greg, > > On Mon, 24 Sep 2012 16:49:16 +1000 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the usb tree got a conflict in > > drivers/usb/core/usb-acpi.c between commit 59e6423ba8aa ("usb-acpi: > > Comply

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

2012-09-25 Thread Greg KH
On Mon, Sep 24, 2012 at 04:54:49PM +1000, Stephen Rothwell wrote: Hi Greg, On Mon, 24 Sep 2012 16:49:16 +1000 Stephen Rothwell s...@canb.auug.org.au wrote: Today's linux-next merge of the usb tree got a conflict in drivers/usb/core/usb-acpi.c between commit 59e6423ba8aa (usb-acpi:

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

2012-09-24 Thread Stephen Rothwell
Hi Greg, On Mon, 24 Sep 2012 16:49:16 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the usb tree got a conflict in > drivers/usb/core/usb-acpi.c between commit 59e6423ba8aa ("usb-acpi: > Comply with the ACPI API change") from the acpi tree and commit > 05f916894a69 ("usb/acpi:

linux-next: manual merge of the usb tree with the acpi tree

2012-09-24 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/core/usb-acpi.c between commit 59e6423ba8aa ("usb-acpi: Comply with the ACPI API change") from the acpi tree and commit 05f916894a69 ("usb/acpi: Store info on device removability") from the usb tree. The latter

linux-next: manual merge of the usb tree with the acpi tree

2012-09-24 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the usb tree got a conflict in drivers/usb/core/usb-acpi.c between commit 59e6423ba8aa (usb-acpi: Comply with the ACPI API change) from the acpi tree and commit 05f916894a69 (usb/acpi: Store info on device removability) from the usb tree. The latter removed

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

2012-09-24 Thread Stephen Rothwell
Hi Greg, On Mon, 24 Sep 2012 16:49:16 +1000 Stephen Rothwell s...@canb.auug.org.au wrote: Today's linux-next merge of the usb tree got a conflict in drivers/usb/core/usb-acpi.c between commit 59e6423ba8aa (usb-acpi: Comply with the ACPI API change) from the acpi tree and commit 05f916894a69