* linux-next: manual merge of the gpio tree with the pm tree
@ 2013-11-19 1:43 Stephen Rothwell
2013-11-19 7:52 ` Linus Walleij
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2013-11-19 1:43 UTC (permalink / raw)
To: Linus Walleij
Cc: linux-next, linux-kernel, Alexandre Courbot, Rafael J. Wysocki
[-- Attachment #1: Type: text/plain, Size: 869 bytes --]
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 gpio tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/gpio/gpiolib.c
index 4e10b10d3ddd,48d1a67ed488..000000000000
--- a/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@@ -13,7 -13,7 +13,8 @@@
#include <linux/acpi_gpio.h>
#include <linux/idr.h>
#include <linux/slab.h>
+#include <linux/acpi.h>
+ #include <linux/gpio/driver.h>
#define CREATE_TRACE_POINTS
#include <trace/events/gpio.h>
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the gpio tree with the pm tree
2013-11-19 1:43 linux-next: manual merge of the gpio tree with the pm tree Stephen Rothwell
@ 2013-11-19 7:52 ` Linus Walleij
2013-11-19 13:31 ` Rafael J. Wysocki
0 siblings, 1 reply; 3+ messages in thread
From: Linus Walleij @ 2013-11-19 7:52 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Alexandre Courbot, Rafael J. Wysocki
On Tue, Nov 19, 2013 at 2:43 AM, Stephen Rothwell <sfr@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 f760f1967ee8 ("gpiolib: use dedicated flags for GPIO
> properties") from the gpio tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Oh I never saw that patch before ... anyway it seems to be
correct, thanks.
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the gpio tree with the pm tree
2013-11-19 7:52 ` Linus Walleij
@ 2013-11-19 13:31 ` Rafael J. Wysocki
0 siblings, 0 replies; 3+ messages in thread
From: Rafael J. Wysocki @ 2013-11-19 13:31 UTC (permalink / raw)
To: Linus Walleij, Stephen Rothwell
Cc: linux-next, linux-kernel, Alexandre Courbot, 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 <sfr@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 f760f1967ee8 ("gpiolib: use dedicated flags for GPIO
> > properties") from the gpio tree.
> >
> > I fixed it up (see below) and can carry the fix as necessary (no action
> > is required).
>
> Oh I never saw that patch before ...
Well, sorry about that ...
> anyway it seems to be correct, thanks.
Yes, it looks correct to me too.
Thanks for fixing this up Stephen!
Rafael
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-11-19 13:18 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-11-19 1:43 linux-next: manual merge of the gpio tree with the pm tree Stephen Rothwell
2013-11-19 7:52 ` Linus Walleij
2013-11-19 13:31 ` Rafael J. Wysocki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).