diff for duplicates of <20180710102050.78ae0ea8@gandalf.local.home>

diff --git a/a/1.txt b/N1/1.txt
index b2d0512..5b1db22 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,5 +1,5 @@
 On Thu, 28 Jun 2018 11:21:47 -0700
-Joel Fernandes <joel@joelfernandes.org> wrote:
+Joel Fernandes <joel at joelfernandes.org> wrote:
 
 > diff --git a/kernel/trace/trace_preemptirq.c b/kernel/trace/trace_preemptirq.c
 > new file mode 100644
@@ -21,7 +21,7 @@ I'm still playing around with this patch, and testing it.
 > +/*
 > + * 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>
@@ -88,4 +88,9 @@ I'm still playing around with this patch, and testing it.
 > +{
 > +	trace_preempt_disable_rcuidle(a0, a1);
 > +}
-> +#endif
\ No newline at end of file
+> +#endif
+
+--
+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 dd7e2ab..7ffff15 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,32 +5,14 @@
   "ref\00020180628182149.226164-6-joel\@joelfernandes.org\0"
 ]
 [
-  "From\0Steven Rostedt <rostedt\@goodmis.org>\0"
+  "From\0rostedt at goodmis.org (Steven Rostedt)\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\0Tue, 10 Jul 2018 10:20:50 -0400\0"
 ]
-[
-  "To\0Joel Fernandes <joel\@joelfernandes.org>\0"
-]
-[
-  "Cc\0linux-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>",
-  " Peter Zijlstra <peterz\@infradead.org>",
-  " Thomas Glexiner <tglx\@linutronix.de>",
-  " Tom Zanussi <tom.zanussi\@linux.intel.com>\0"
-]
 [
   "\0000:1\0"
 ]
@@ -39,7 +21,7 @@
 ]
 [
   "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",
   "> diff --git a/kernel/trace/trace_preemptirq.c b/kernel/trace/trace_preemptirq.c\n",
   "> new file mode 100644\n",
@@ -61,7 +43,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",
@@ -128,7 +110,12 @@
   "> +{\n",
   "> +\ttrace_preempt_disable_rcuidle(a0, a1);\n",
   "> +}\n",
-  "> +#endif"
+  "> +#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"
 ]
 
-f9ede659f540c55af7cac90d9c500b68a3e363b529d432207f8ee3b6a5867fd7
+621955ab34d753d49597c267868d855f945dfcf701fe219e0b2b6fc1e1a831d6
