Messages in this thread | | | Date | Mon, 13 Jan 2014 14:29:39 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tip tree with the pm tree |
| |
Hi all,
Today's linux-next merge of the tip tree got a conflict in drivers/acpi/apei/einj.c between commit 8b48463f8942 ("ACPI: Clean up inclusions of ACPI header files") from the pm tree and commit d3ab3edc029b ("ACPI, APEI: Cleanup alignment-aware accesses") from the tip 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/acpi/apei/einj.c index ca0c6d7ec0d4,7dcc8a824aae..000000000000 --- a/drivers/acpi/apei/einj.c +++ b/drivers/acpi/apei/einj.c @@@ -33,6 -33,8 +33,7 @@@ #include <linux/nmi.h> #include <linux/delay.h> #include <linux/mm.h> -#include <acpi/acpi.h> + #include <asm/unaligned.h> #include "apei-internal.h" [unhandled content-type:application/pgp-signature] | |