diff for duplicates of <20180621223647.GA212425@joelaf.mtv.corp.google.com>

diff --git a/a/1.txt b/N1/1.txt
index 54c635e..5369c81 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>
 
 In this patch we introduce a test module for simulating a long atomic
 section in the kernel which the preemptoff or irqsoff tracers can
@@ -36,10 +36,10 @@ irq dis -1069    1d..1 500002us : tracer_hardirqs_on <-atomic_sect_run
 irq dis -1069    1d..1 500005us : <stack trace>
  => ret_from_fork
 
-Co-developed-by: Erick Reyes <erickreyes@google.com>
-Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Signed-off-by: Joel Fernandes (Google) <joel@joelfernandes.org>
+Co-developed-by: Erick Reyes <erickreyes at google.com>
+Cc: Andy Shevchenko <andriy.shevchenko at linux.intel.com>
+Reviewed-by: Andy Shevchenko <andriy.shevchenko at linux.intel.com>
+Signed-off-by: Joel Fernandes (Google) <joel at joelfernandes.org>
 ---
  lib/Kconfig.debug          |  8 ++++
  lib/Makefile               |  1 +
@@ -162,4 +162,9 @@ index 000000000000..1eef518f0974
 +module_exit(atomic_sect_exit)
 +MODULE_LICENSE("GPL v2");
 -- 
-2.18.0.rc2.346.g013aa6912e-goog
\ No newline at end of file
+2.18.0.rc2.346.g013aa6912e-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 e6b0640..8564602 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
   "ref\00020180621223236.211495-1-joel\@joelfernandes.org\0"
 ]
 [
-  "From\0Joel Fernandes <joelaf\@google.com>\0"
+  "From\0joelaf at google.com (Joel Fernandes)\0"
 ]
 [
   "Subject\0[PATCH v9 6/7] lib: Add module to simulate atomic sections for testing preemptoff tracers\0"
@@ -10,31 +10,6 @@
 [
   "Date\0Thu, 21 Jun 2018 15:36:47 -0700\0"
 ]
-[
-  "To\0linux-kernel\@vger.kernel.org\0"
-]
-[
-  "Cc\0kernel-team\@android.com",
-  " Joel Fernandes (Google) <joel\@joelfernandes.org>",
-  " Andy Shevchenko <andriy.shevchenko\@linux.intel.com>",
-  " 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>",
-  " Will Deacon <will.deacon\@arm.com>\0"
-]
 [
   "\0000:1\0"
 ]
@@ -42,7 +17,7 @@
   "b\0"
 ]
 [
-  "From: \"Joel Fernandes (Google)\" <joel\@joelfernandes.org>\n",
+  "From: \"Joel Fernandes (Google)\" <joel at joelfernandes.org>\n",
   "\n",
   "In this patch we introduce a test module for simulating a long atomic\n",
   "section in the kernel which the preemptoff or irqsoff tracers can\n",
@@ -80,10 +55,10 @@
   "irq dis -1069    1d..1 500005us : <stack trace>\n",
   " => ret_from_fork\n",
   "\n",
-  "Co-developed-by: Erick Reyes <erickreyes\@google.com>\n",
-  "Cc: Andy Shevchenko <andriy.shevchenko\@linux.intel.com>\n",
-  "Reviewed-by: Andy Shevchenko <andriy.shevchenko\@linux.intel.com>\n",
-  "Signed-off-by: Joel Fernandes (Google) <joel\@joelfernandes.org>\n",
+  "Co-developed-by: Erick Reyes <erickreyes at google.com>\n",
+  "Cc: Andy Shevchenko <andriy.shevchenko at linux.intel.com>\n",
+  "Reviewed-by: Andy Shevchenko <andriy.shevchenko at linux.intel.com>\n",
+  "Signed-off-by: Joel Fernandes (Google) <joel at joelfernandes.org>\n",
   "---\n",
   " lib/Kconfig.debug          |  8 ++++\n",
   " lib/Makefile               |  1 +\n",
@@ -206,7 +181,12 @@
   "+module_exit(atomic_sect_exit)\n",
   "+MODULE_LICENSE(\"GPL v2\");\n",
   "-- \n",
-  "2.18.0.rc2.346.g013aa6912e-goog"
+  "2.18.0.rc2.346.g013aa6912e-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"
 ]
 
-ed8eb199e55ddc1d57755cda67583c570c539e20f1aed4c1d99f041d587ec0ff
+5bc530d66d648d08d59d8a2b599bbe8c82a0010baf1a819224007bc215a8639c
