Hi all, Today's linux-next merge of the percpu tree got a conflict in arch/x86/kernel/cpu/perf_counter.c between commit 0406ca6d8e849d9dd027c8cb6791448e81411aef ("perf_counter: Ignore the nmi call frames in the x86-64 backtraces") from the tip tree and commit 245b2e70eabd797932adb263a65da0bab3711753 ("percpu: clean up percpu variable definitions") from the percpu 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/cpu/perf_counter.c index 36c3dc7,13bd6d6..0000000 --- a/arch/x86/kernel/cpu/perf_counter.c +++ b/arch/x86/kernel/cpu/perf_counter.c @@@ -1559,9 -1559,8 +1559,9 @@@ void callchain_store(struct perf_callch entry->ip[entry->nr++] = ip; } - static DEFINE_PER_CPU(struct perf_callchain_entry, irq_entry); - static DEFINE_PER_CPU(struct perf_callchain_entry, nmi_entry); + static DEFINE_PER_CPU(struct perf_callchain_entry, pmc_irq_entry); + static DEFINE_PER_CPU(struct perf_callchain_entry, pmc_nmi_entry); +static DEFINE_PER_CPU(int, in_nmi_frame); static void -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html