diff for duplicates of <1461239325-22779-5-git-send-email-pmladek@suse.com>
diff --git a/a/1.txt b/N1/1.txt
index 22654f0..b0e14cc 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -53,7 +53,7 @@ index 8d34308ea449..1dc3fe8495e0 100644
+++ b/kernel/kexec_core.c
@@ -893,6 +893,7 @@ void crash_kexec(struct pt_regs *regs)
old_cpu = atomic_cmpxchg(&panic_cpu, PANIC_CPU_INVALID, this_cpu);
- if (old_cpu = PANIC_CPU_INVALID) {
+ if (old_cpu == PANIC_CPU_INVALID) {
/* This is the 1st CPU which comes here, so go ahead. */
+ printk_nmi_flush_on_panic();
__crash_kexec(regs);
diff --git a/a/content_digest b/N1/content_digest
index 22bef3f..3579339 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,10 +8,32 @@
"Subject\0[PATCH v5 4/4] printk/nmi: flush NMI messages on the system panic\0"
]
[
- "Date\0Thu, 21 Apr 2016 11:48:45 +0000\0"
+ "Date\0Thu, 21 Apr 2016 13:48:45 +0200\0"
]
[
- "To\0linux-arm-kernel\@lists.infradead.org\0"
+ "To\0Andrew Morton <akpm\@linux-foundation.org>\0"
+]
+[
+ "Cc\0Peter Zijlstra <peterz\@infradead.org>",
+ " Steven Rostedt <rostedt\@goodmis.org>",
+ " Russell King <rmk+kernel\@arm.linux.org.uk>",
+ " Daniel Thompson <daniel.thompson\@linaro.org>",
+ " Jiri Kosina <jkosina\@suse.com>",
+ " Ingo Molnar <mingo\@redhat.com>",
+ " Thomas Gleixner <tglx\@linutronix.de>",
+ " Sergey Senozhatsky <sergey.senozhatsky.work\@gmail.com>",
+ " Chris Metcalf <cmetcalf\@ezchip.com>",
+ " linux-kernel\@vger.kernel.org",
+ " x86\@kernel.org",
+ " linux-arm-kernel\@lists.infradead.org",
+ " adi-buildroot-devel\@lists.sourceforge.net",
+ " linux-cris-kernel\@axis.com",
+ " linux-mips\@linux-mips.org",
+ " linuxppc-dev\@lists.ozlabs.org",
+ " linux-s390\@vger.kernel.org",
+ " linux-sh\@vger.kernel.org",
+ " sparclinux\@vger.kernel.org",
+ " Petr Mladek <pmladek\@suse.com>\0"
]
[
"\0000:1\0"
@@ -75,7 +97,7 @@
"+++ b/kernel/kexec_core.c\n",
"\@\@ -893,6 +893,7 \@\@ void crash_kexec(struct pt_regs *regs)\n",
" \told_cpu = atomic_cmpxchg(&panic_cpu, PANIC_CPU_INVALID, this_cpu);\n",
- " \tif (old_cpu = PANIC_CPU_INVALID) {\n",
+ " \tif (old_cpu == PANIC_CPU_INVALID) {\n",
" \t\t/* This is the 1st CPU which comes here, so go ahead. */\n",
"+\t\tprintk_nmi_flush_on_panic();\n",
" \t\t__crash_kexec(regs);\n",
@@ -200,4 +222,4 @@
"1.8.5.6"
]
-e717db3d947740e4932a24d5dc34238c90b0480a637726cbd3be8fbdac8b857b
+0eaed897bc618c214f3d9ac463a2d88278c56cb1540bbf22f3fe60aea54fa77c
diff --git a/a/1.txt b/N2/1.txt
index 22654f0..b0e14cc 100644
--- a/a/1.txt
+++ b/N2/1.txt
@@ -53,7 +53,7 @@ index 8d34308ea449..1dc3fe8495e0 100644
+++ b/kernel/kexec_core.c
@@ -893,6 +893,7 @@ void crash_kexec(struct pt_regs *regs)
old_cpu = atomic_cmpxchg(&panic_cpu, PANIC_CPU_INVALID, this_cpu);
- if (old_cpu = PANIC_CPU_INVALID) {
+ if (old_cpu == PANIC_CPU_INVALID) {
/* This is the 1st CPU which comes here, so go ahead. */
+ printk_nmi_flush_on_panic();
__crash_kexec(regs);
diff --git a/a/content_digest b/N2/content_digest
index 22bef3f..2f6bd18 100644
--- a/a/content_digest
+++ b/N2/content_digest
@@ -2,13 +2,13 @@
"ref\0001461239325-22779-1-git-send-email-pmladek\@suse.com\0"
]
[
- "From\0Petr Mladek <pmladek\@suse.com>\0"
+ "From\0pmladek\@suse.com (Petr Mladek)\0"
]
[
"Subject\0[PATCH v5 4/4] printk/nmi: flush NMI messages on the system panic\0"
]
[
- "Date\0Thu, 21 Apr 2016 11:48:45 +0000\0"
+ "Date\0Thu, 21 Apr 2016 13:48:45 +0200\0"
]
[
"To\0linux-arm-kernel\@lists.infradead.org\0"
@@ -75,7 +75,7 @@
"+++ b/kernel/kexec_core.c\n",
"\@\@ -893,6 +893,7 \@\@ void crash_kexec(struct pt_regs *regs)\n",
" \told_cpu = atomic_cmpxchg(&panic_cpu, PANIC_CPU_INVALID, this_cpu);\n",
- " \tif (old_cpu = PANIC_CPU_INVALID) {\n",
+ " \tif (old_cpu == PANIC_CPU_INVALID) {\n",
" \t\t/* This is the 1st CPU which comes here, so go ahead. */\n",
"+\t\tprintk_nmi_flush_on_panic();\n",
" \t\t__crash_kexec(regs);\n",
@@ -200,4 +200,4 @@
"1.8.5.6"
]
-e717db3d947740e4932a24d5dc34238c90b0480a637726cbd3be8fbdac8b857b
+d422568513d2695f42d55c6b620b6da883f07a60dfd545e1ed3d962eca02b707
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.