Hi Andrew, Today's linux-next merge of the akpm tree got a conflict in arch/x86/kernel/nmi_selftest.c between commit f0ba662a6e06 ("x86: Properly _init-annotate NMI selftest code") from the tip tree and commit "x86: use this_cpu_xxx to replace percpu_xxx funcs" from the akpm tree. Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx diff --cc arch/x86/kernel/nmi_selftest.c index 2c39dcd,8aca005..0000000 --- a/arch/x86/kernel/nmi_selftest.c +++ b/arch/x86/kernel/nmi_selftest.c @@@ -12,7 -12,7 +12,8 @@@ #include <linux/smp.h> #include <linux/cpumask.h> #include <linux/delay.h> +#include <linux/init.h> + #include <linux/percpu.h> #include <asm/apic.h> #include <asm/nmi.h>
Attachment:
pgpXLS9svk_Vf.pgp
Description: PGP signature