Re: linux-next: manual merge of the gpio tree with the pm tree

2013-11-19 Thread Rafael J. Wysocki
On Tuesday, November 19, 2013 08:52:13 AM Linus Walleij wrote: > On Tue, Nov 19, 2013 at 2:43 AM, Stephen Rothwell > wrote: > > > Today's linux-next merge of the gpio tree got a conflict in > > drivers/gpio/gpiolib.c between commit 7b1998116bbb ("ACPI / driver core: > > Store an ACPI device

Re: linux-next: manual merge of the gpio tree with the pm tree

2013-11-19 Thread Rafael J. Wysocki
On Tuesday, November 19, 2013 08:52:13 AM Linus Walleij wrote: On Tue, Nov 19, 2013 at 2:43 AM, Stephen Rothwell s...@canb.auug.org.au wrote: Today's linux-next merge of the gpio tree got a conflict in drivers/gpio/gpiolib.c between commit 7b1998116bbb (ACPI / driver core: Store an ACPI

Re: linux-next: manual merge of the gpio tree with the pm tree

2013-11-18 Thread Linus Walleij
On Tue, Nov 19, 2013 at 2:43 AM, Stephen Rothwell wrote: > Today's linux-next merge of the gpio tree got a conflict in > drivers/gpio/gpiolib.c between commit 7b1998116bbb ("ACPI / driver core: > Store an ACPI device pointer in struct acpi_dev_node") from the pm tree > and commit f760f1967ee8

linux-next: manual merge of the gpio tree with the pm tree

2013-11-18 Thread Stephen Rothwell
Hi Linus, Today's linux-next merge of the gpio tree got a conflict in drivers/gpio/gpiolib.c between commit 7b1998116bbb ("ACPI / driver core: Store an ACPI device pointer in struct acpi_dev_node") from the pm tree and commit f760f1967ee8 ("gpiolib: use dedicated flags for GPIO properties") from

linux-next: manual merge of the gpio tree with the pm tree

2013-11-18 Thread Stephen Rothwell
Hi Linus, Today's linux-next merge of the gpio tree got a conflict in drivers/gpio/gpiolib.c between commit 7b1998116bbb (ACPI / driver core: Store an ACPI device pointer in struct acpi_dev_node) from the pm tree and commit f760f1967ee8 (gpiolib: use dedicated flags for GPIO properties) from the

Re: linux-next: manual merge of the gpio tree with the pm tree

2013-11-18 Thread Linus Walleij
On Tue, Nov 19, 2013 at 2:43 AM, Stephen Rothwell s...@canb.auug.org.au wrote: Today's linux-next merge of the gpio tree got a conflict in drivers/gpio/gpiolib.c between commit 7b1998116bbb (ACPI / driver core: Store an ACPI device pointer in struct acpi_dev_node) from the pm tree and commit