diff for duplicates of <20180530000500.257225-7-joel@joelfernandes.org>

diff --git a/a/1.txt b/N1/1.txt
index ffb8136..cc920d3 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>
 
 This patch detaches the preemptirq tracepoints from the tracers and
 keeps it separate.
@@ -81,7 +81,7 @@ With probes:
 [    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>
 ---
  include/linux/ftrace.h            |  11 +-
  include/linux/irqflags.h          |  11 +-
@@ -769,7 +769,7 @@ index 000000000000..dc01c7f4d326
 +/*
 + * 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>
@@ -838,4 +838,9 @@ index 000000000000..dc01c7f4d326
 +}
 +#endif
 -- 
-2.17.0.921.gf22659ad46-goog
\ No newline at end of file
+2.17.0.921.gf22659ad46-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 e59e6e1..f92ccb7 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
   "ref\00020180530000500.257225-1-joel\@joelfernandes.org\0"
 ]
 [
-  "From\0Joel Fernandes <joelaf\@google.com>\0"
+  "From\0joelaf at google.com (Joel Fernandes)\0"
 ]
 [
   "Subject\0[PATCH v8 6/8] tracing: Centralize preemptirq tracepoints and unify their usage\0"
@@ -10,29 +10,6 @@
 [
   "Date\0Tue, 29 May 2018 17:04:58 -0700\0"
 ]
-[
-  "To\0linux-kernel\@vger.kernel.org\0"
-]
-[
-  "Cc\0kernel-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>",
-  " 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>\0"
-]
 [
   "\0000:1\0"
 ]
@@ -40,7 +17,7 @@
   "b\0"
 ]
 [
-  "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",
@@ -123,7 +100,7 @@
   "[    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",
   " include/linux/ftrace.h            |  11 +-\n",
   " include/linux/irqflags.h          |  11 +-\n",
@@ -811,7 +788,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",
@@ -880,7 +857,12 @@
   "+}\n",
   "+#endif\n",
   "-- \n",
-  "2.17.0.921.gf22659ad46-goog"
+  "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"
 ]
 
-45f05884df0cf695df195641be9a7e438c61817db0336e60a46062f2e6209345
+e5794f8cb874eb72cbec32151b4df5337b6a8628bc926279451e530a4957bc37
