diff for duplicates of <20180625221302.8507c98e500d8efc70c19d88@kernel.org>

diff --git a/a/1.txt b/N1/1.txt
index 630c0fb..625ee7a 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,7 +1,7 @@
 Hi Joel,
 
 On Thu, 21 Jun 2018 15:32:36 -0700
-Joel Fernandes <joel@joelfernandes.org> wrote:
+Joel Fernandes <joel at joelfernandes.org> wrote:
 [...]
 > +++ b/tools/testing/selftests/ftrace/test.d/preemptirq/irqsoff_tracer.tc
 > @@ -0,0 +1,74 @@
@@ -95,4 +95,8 @@ Thanks,
 
 
 -- 
-Masami Hiramatsu <mhiramat@kernel.org>
\ No newline at end of file
+Masami Hiramatsu <mhiramat at kernel.org>
+--
+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 ec2c17e..eaeca91 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,38 +5,14 @@
   "ref\00020180621223236.211495-8-joel\@joelfernandes.org\0"
 ]
 [
-  "From\0Masami Hiramatsu <mhiramat\@kernel.org>\0"
+  "From\0mhiramat at kernel.org (Masami Hiramatsu)\0"
 ]
 [
-  "Subject\0Re: [PATCH v9 7/7] kselftests: Add tests for the preemptoff and irqsoff tracers\0"
+  "Subject\0[PATCH v9 7/7] kselftests: Add tests for the preemptoff and irqsoff tracers\0"
 ]
 [
   "Date\0Mon, 25 Jun 2018 22:13:02 +0900\0"
 ]
-[
-  "To\0Joel Fernandes <joel\@joelfernandes.org>\0"
-]
-[
-  "Cc\0linux-kernel\@vger.kernel.org",
-  " kernel-team\@android.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"
 ]
@@ -47,7 +23,7 @@
   "Hi Joel,\n",
   "\n",
   "On Thu, 21 Jun 2018 15:32:36 -0700\n",
-  "Joel Fernandes <joel\@joelfernandes.org> wrote:\n",
+  "Joel Fernandes <joel at joelfernandes.org> wrote:\n",
   "[...]\n",
   "> +++ b/tools/testing/selftests/ftrace/test.d/preemptirq/irqsoff_tracer.tc\n",
   "> \@\@ -0,0 +1,74 \@\@\n",
@@ -141,7 +117,11 @@
   "\n",
   "\n",
   "-- \n",
-  "Masami Hiramatsu <mhiramat\@kernel.org>"
+  "Masami Hiramatsu <mhiramat at kernel.org>\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"
 ]
 
-4161328a022d9748be405e5173aba3dfc722d02dfc475af0f7cfa805f448ac37
+0281acf57fad4044696c86f7feb57b5253757a80c82dab4343050365172b3895
