diff for duplicates of <20180531015639.GB25985@sejong>

diff --git a/a/1.txt b/N1/1.txt
index ecb70a0..2786cd7 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,5 +1,5 @@
 On Tue, May 29, 2018 at 05:04:58PM -0700, Joel Fernandes wrote:
-> From: "Joel Fernandes (Google)" <joel@joelfernandes.org>
+> From: "Joel Fernandes (Google)" <joel at joelfernandes.org>
 > 
 > This patch detaches the preemptirq tracepoints from the tracers and
 > keeps it separate.
@@ -82,9 +82,9 @@ On Tue, May 29, 2018 at 05:04:58PM -0700, Joel Fernandes wrote:
 > [    0.000000]     hard-safe-A + unsafe-B #1/123:  ok  |  ok  |  ok  |
 > [    0.000000]     soft-safe-A + unsafe-B #1/123:  ok  |  ok  |  ok  |
 > 
-> Signed-off-by: Joel Fernandes (Google) <joel@joelfernandes.org>
+> Signed-off-by: Joel Fernandes (Google) <joel at joelfernandes.org>
 
-Reviewed-by: Namhyung Kim <namhyung@kernel.org>
+Reviewed-by: Namhyung Kim <namhyung at kernel.org>
 
 Thanks,
 Namhyung
@@ -777,7 +777,7 @@ Namhyung
 > +/*
 > + * preemptoff and irqoff tracepoints
 > + *
-> + * Copyright (C) Joel Fernandes (Google) <joel@joelfernandes.org>
+> + * Copyright (C) Joel Fernandes (Google) <joel at joelfernandes.org>
 > + */
 > +
 > +#include <linux/kallsyms.h>
@@ -847,4 +847,8 @@ Namhyung
 > +#endif
 > -- 
 > 2.17.0.921.gf22659ad46-goog
->
\ No newline at end of file
+> 
+--
+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 da1f14a..0a02a73 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,38 +5,14 @@
   "ref\00020180530000500.257225-7-joel\@joelfernandes.org\0"
 ]
 [
-  "From\0Namhyung Kim <namhyung\@kernel.org>\0"
+  "From\0namhyung at kernel.org (Namhyung Kim)\0"
 ]
 [
-  "Subject\0Re: [PATCH v8 6/8] tracing: Centralize preemptirq tracepoints and unify their usage\0"
+  "Subject\0[PATCH v8 6/8] tracing: Centralize preemptirq tracepoints and unify their usage\0"
 ]
 [
   "Date\0Thu, 31 May 2018 10:56:39 +0900\0"
 ]
-[
-  "To\0Joel Fernandes <joelaf\@google.com>\0"
-]
-[
-  "Cc\0linux-kernel\@vger.kernel.org",
-  " kernel-team\@android.com",
-  " Joel Fernandes (Google) <joel\@joelfernandes.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>",
-  " 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>",
-  " kernel-team\@lge.com\0"
-]
 [
   "\0000:1\0"
 ]
@@ -45,7 +21,7 @@
 ]
 [
   "On Tue, May 29, 2018 at 05:04:58PM -0700, Joel Fernandes wrote:\n",
-  "> From: \"Joel Fernandes (Google)\" <joel\@joelfernandes.org>\n",
+  "> From: \"Joel Fernandes (Google)\" <joel at joelfernandes.org>\n",
   "> \n",
   "> This patch detaches the preemptirq tracepoints from the tracers and\n",
   "> keeps it separate.\n",
@@ -128,9 +104,9 @@
   "> [    0.000000]     hard-safe-A + unsafe-B #1/123:  ok  |  ok  |  ok  |\n",
   "> [    0.000000]     soft-safe-A + unsafe-B #1/123:  ok  |  ok  |  ok  |\n",
   "> \n",
-  "> Signed-off-by: Joel Fernandes (Google) <joel\@joelfernandes.org>\n",
+  "> Signed-off-by: Joel Fernandes (Google) <joel at joelfernandes.org>\n",
   "\n",
-  "Reviewed-by: Namhyung Kim <namhyung\@kernel.org>\n",
+  "Reviewed-by: Namhyung Kim <namhyung at kernel.org>\n",
   "\n",
   "Thanks,\n",
   "Namhyung\n",
@@ -823,7 +799,7 @@
   "> +/*\n",
   "> + * preemptoff and irqoff tracepoints\n",
   "> + *\n",
-  "> + * Copyright (C) Joel Fernandes (Google) <joel\@joelfernandes.org>\n",
+  "> + * Copyright (C) Joel Fernandes (Google) <joel at joelfernandes.org>\n",
   "> + */\n",
   "> +\n",
   "> +#include <linux/kallsyms.h>\n",
@@ -893,7 +869,11 @@
   "> +#endif\n",
   "> -- \n",
   "> 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"
 ]
 
-798e0da63b7e3decac1a64b5bdf2013463ebfa62bd9c20064804a19e54ca9f29
+d419d9977056d11c32c999d31c3c138bb235138bece2d0de6f50f505899b29a8
