Messages in this thread | | | Date | Mon, 17 Aug 2009 18:06:19 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the sfi tree with the acpi tree |
| |
Hi all,
Today's linux-next merge of the sfi tree got a conflict in arch/x86/include/asm/io_apic.h arch/x86/kernel/acpi/boot.c arch/x86/kernel/apic/io_apic.c between commit f488a00f3759327c687e17858c07a1b0ea811cf0 ("ACPI, x86: remove ACPI dependency on some IO-APIC routines") from the acpi tree and commit 2a98e7573b83bac1a79292a428090ee352626216 ("ACPI, x86: expose some IO-APIC routines when CONFIG_ACPI=n") from the sfi tree.
The latter seems to be a superset of the former (with one name change uniq_ioapic_id -> io_apic_unique_id). I fixed it up (using the sfi trees' versions) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |