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 [email protected] 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>
pgpbW9IY2glUO.pgp
Description: PGP signature
