diff for duplicates of <20180707042043.GA216408@joelaf.mtv.corp.google.com>

diff --git a/a/1.txt b/N1/1.txt
index 1d31304..b6d9bbf 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -26,9 +26,9 @@ the lockdep bits and thanks.
 > 
 > 
 > On Thu, 28 Jun 2018 11:21:47 -0700
-> Joel Fernandes <joel@joelfernandes.org> wrote:
+> Joel Fernandes <joel at joelfernandes.org> 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.
@@ -110,8 +110,8 @@ the lockdep bits and thanks.
 > > [    0.000000]     hard-safe-A + unsafe-B #1/123:  ok  |  ok  |  ok  |
 > > [    0.000000]     soft-safe-A + unsafe-B #1/123:  ok  |  ok  |  ok  |
 > > 
-> > Reviewed-by: Namhyung Kim <namhyung@kernel.org>
-> > Signed-off-by: Joel Fernandes (Google) <joel@joelfernandes.org>
+> > Reviewed-by: Namhyung Kim <namhyung at kernel.org>
+> > Signed-off-by: Joel Fernandes (Google) <joel at joelfernandes.org>
 > > ---
 > >  include/linux/ftrace.h            |  11 +-
 > >  include/linux/irqflags.h          |  11 +-
@@ -799,7 +799,7 @@ the lockdep bits and thanks.
 > > +/*
 > > + * 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>
@@ -867,4 +867,8 @@ the lockdep bits and thanks.
 > > +	trace_preempt_disable_rcuidle(a0, a1);
 > > +}
 > > +#endif
->
\ 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 c15ee32..a8838a8 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,32 +8,14 @@
   "ref\00020180706180610.3816b9b0\@gandalf.local.home\0"
 ]
 [
-  "From\0Joel Fernandes <joel\@joelfernandes.org>\0"
+  "From\0joel at joelfernandes.org (Joel Fernandes)\0"
 ]
 [
-  "Subject\0Re: [PATCH v9 5/7] tracing: Centralize preemptirq tracepoints and unify their usage\0"
+  "Subject\0[PATCH v9 5/7] tracing: Centralize preemptirq tracepoints and unify their usage\0"
 ]
 [
   "Date\0Fri, 6 Jul 2018 21:20:43 -0700\0"
 ]
-[
-  "To\0Steven Rostedt <rostedt\@goodmis.org>\0"
-]
-[
-  "Cc\0Peter Zijlstra <peterz\@infradead.org>",
-  " linux-kernel\@vger.kernel.org",
-  " Boqun Feng <boqun.feng\@gmail.com>",
-  " Byungchul Park <byungchul.park\@lge.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>",
-  " Thomas Glexiner <tglx\@linutronix.de>",
-  " Tom Zanussi <tom.zanussi\@linux.intel.com>\0"
-]
 [
   "\0000:1\0"
 ]
@@ -69,9 +51,9 @@
   "> \n",
   "> \n",
   "> On Thu, 28 Jun 2018 11:21:47 -0700\n",
-  "> Joel Fernandes <joel\@joelfernandes.org> wrote:\n",
+  "> Joel Fernandes <joel at joelfernandes.org> wrote:\n",
   "> \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",
@@ -153,8 +135,8 @@
   "> > [    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",
-  "> > Reviewed-by: Namhyung Kim <namhyung\@kernel.org>\n",
-  "> > Signed-off-by: Joel Fernandes (Google) <joel\@joelfernandes.org>\n",
+  "> > Reviewed-by: Namhyung Kim <namhyung at kernel.org>\n",
+  "> > Signed-off-by: Joel Fernandes (Google) <joel at joelfernandes.org>\n",
   "> > ---\n",
   "> >  include/linux/ftrace.h            |  11 +-\n",
   "> >  include/linux/irqflags.h          |  11 +-\n",
@@ -842,7 +824,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",
@@ -910,7 +892,11 @@
   "> > +\ttrace_preempt_disable_rcuidle(a0, a1);\n",
   "> > +}\n",
   "> > +#endif\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"
 ]
 
-cbbeac92f4dd1c63ceb601c0589a408b0c964209153143db791d8908a3f7fbbc
+bcc54b459b687b3b0b5ce83796815f887f37b836ec5daa8524fd94fdbc566c73
