Messages in this thread | | | Date | Thu, 4 Oct 2012 11:40:30 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the acpi tree with Linus' tree |
| |
Hi Len,
Today's linux-next merge of the acpi tree got a conflict in include/acpi/acpixf.h between commit a1ce39288e6f ("UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers") from Linus' tree and commit be030a576854 ("ACPICA: Add support for complex _PLD buffers") from the acpi 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 include/acpi/acpixf.h index 51405d3,267bfc4..0000000 --- a/include/acpi/acpixf.h +++ b/include/acpi/acpixf.h @@@ -47,11 -47,12 +47,12 @@@ /* Current ACPICA subsystem version in YYYYMMDD format */ - #define ACPI_CA_VERSION 0x20120711 + #define ACPI_CA_VERSION 0x20120913 -#include "acconfig.h" -#include "actypes.h" -#include "actbl.h" -#include "acbuffer.h" +#include <acpi/acconfig.h> +#include <acpi/actypes.h> +#include <acpi/actbl.h> ++#include <acpi/acbuffer.h> extern u8 acpi_gbl_permanent_mmap; [unhandled content-type:application/pgp-signature] | |