diff for duplicates of <20180530000500.257225-2-joel@joelfernandes.org>

diff --git a/a/1.txt b/N1/1.txt
index 7436f4f..20fe438 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,4 +1,4 @@
-From: "Joel Fernandes (Google)" <joel@joelfernandes.org>
+From: "Joel Fernandes (Google)" <joel at joelfernandes.org>
 
 I'm able to reproduce a lockdep splat with config options:
 CONFIG_PROVE_LOCKING=y,
@@ -44,10 +44,10 @@ preempt_count = 1 << SOFTIRQ_SHIFT
 Where preempt_count still has softirqs disabled, but
 current->softirqs_enabled is true, and we get a splat.
 
-Cc: stable@vger.kernel.org
-Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+Cc: stable at vger.kernel.org
+Reviewed-by: Steven Rostedt (VMware) <rostedt at goodmis.org>
 Fixes: d59158162e032 ("tracing: Add support for preempt and irq enable/disable events")
-Signed-off-by: Joel Fernandes (Google) <joel@joelfernandes.org>
+Signed-off-by: Joel Fernandes (Google) <joel at joelfernandes.org>
 ---
  kernel/softirq.c | 6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
@@ -72,4 +72,9 @@ index 177de3640c78..8a040bcaa033 100644
  
  /*
 -- 
-2.17.0.921.gf22659ad46-goog
\ No newline at end of file
+2.17.0.921.gf22659ad46-goog
+
+--
+To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in
+the body of a message to majordomo at vger.kernel.org
+More majordomo info at  http://vger.kernel.org/majordomo-info.html
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 5e2c518..8997c43 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
   "ref\00020180530000500.257225-1-joel\@joelfernandes.org\0"
 ]
 [
-  "From\0Joel Fernandes <joelaf\@google.com>\0"
+  "From\0joelaf at google.com (Joel Fernandes)\0"
 ]
 [
   "Subject\0[PATCH v8 1/8] softirq: reorder trace_softirqs_on to prevent lockdep splat\0"
@@ -10,30 +10,6 @@
 [
   "Date\0Tue, 29 May 2018 17:04:53 -0700\0"
 ]
-[
-  "To\0linux-kernel\@vger.kernel.org\0"
-]
-[
-  "Cc\0kernel-team\@android.com",
-  " Joel Fernandes (Google) <joel\@joelfernandes.org>",
-  " stable\@vger.kernel.org",
-  " Boqun Feng <boqun.feng\@gmail.com>",
-  " Byungchul Park <byungchul.park\@lge.com>",
-  " Erick Reyes <erickreyes\@google.com>",
-  " Ingo Molnar <mingo\@redhat.com>",
-  " Julia Cartwright <julia\@ni.com>",
-  " linux-kselftest\@vger.kernel.org",
-  " Masami Hiramatsu <mhiramat\@kernel.org>",
-  " Mathieu Desnoyers <mathieu.desnoyers\@efficios.com>",
-  " Namhyung Kim <namhyung\@kernel.org>",
-  " Paul McKenney <paulmck\@linux.vnet.ibm.com>",
-  " Peter Zijlstra <peterz\@infradead.org>",
-  " Shuah Khan <shuah\@kernel.org>",
-  " Steven Rostedt <rostedt\@goodmis.org>",
-  " Thomas Glexiner <tglx\@linutronix.de>",
-  " Todd Kjos <tkjos\@google.com>",
-  " Tom Zanussi <tom.zanussi\@linux.intel.com>\0"
-]
 [
   "\0000:1\0"
 ]
@@ -41,7 +17,7 @@
   "b\0"
 ]
 [
-  "From: \"Joel Fernandes (Google)\" <joel\@joelfernandes.org>\n",
+  "From: \"Joel Fernandes (Google)\" <joel at joelfernandes.org>\n",
   "\n",
   "I'm able to reproduce a lockdep splat with config options:\n",
   "CONFIG_PROVE_LOCKING=y,\n",
@@ -87,10 +63,10 @@
   "Where preempt_count still has softirqs disabled, but\n",
   "current->softirqs_enabled is true, and we get a splat.\n",
   "\n",
-  "Cc: stable\@vger.kernel.org\n",
-  "Reviewed-by: Steven Rostedt (VMware) <rostedt\@goodmis.org>\n",
+  "Cc: stable at vger.kernel.org\n",
+  "Reviewed-by: Steven Rostedt (VMware) <rostedt at goodmis.org>\n",
   "Fixes: d59158162e032 (\"tracing: Add support for preempt and irq enable/disable events\")\n",
-  "Signed-off-by: Joel Fernandes (Google) <joel\@joelfernandes.org>\n",
+  "Signed-off-by: Joel Fernandes (Google) <joel at joelfernandes.org>\n",
   "---\n",
   " kernel/softirq.c | 6 +++++-\n",
   " 1 file changed, 5 insertions(+), 1 deletion(-)\n",
@@ -115,7 +91,12 @@
   " \n",
   " /*\n",
   "-- \n",
-  "2.17.0.921.gf22659ad46-goog"
+  "2.17.0.921.gf22659ad46-goog\n",
+  "\n",
+  "--\n",
+  "To unsubscribe from this list: send the line \"unsubscribe linux-kselftest\" in\n",
+  "the body of a message to majordomo at vger.kernel.org\n",
+  "More majordomo info at  http://vger.kernel.org/majordomo-info.html"
 ]
 
-9576d65ad60237e7bd22eb179504985eb1229d5f929a09c85198a08a20418664
+11f3937d6802a12835df666c69ed97b46d510754e6bfe69bc85dc84c1f94512c
