diff for duplicates of <20180524012157.181277-4-joel@joelfernandes.org>

diff --git a/a/1.txt b/N1/1.txt
index 6610e87..9a616de 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>
 
 In the last patch in this series, we are making lockdep register hooks
 onto the irq_{disable,enable} tracepoints. These tracepoints use the
@@ -13,8 +13,8 @@ For this reason we need a notrace variant of srcu_dereference since
 otherwise we get lockdep splats. This patch adds the needed
 srcu_dereference_notrace variant.
 
-Reviewed-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
-Signed-off-by: Joel Fernandes (Google) <joel@joelfernandes.org>
+Reviewed-by: Paul E. McKenney <paulmck at linux.vnet.ibm.com>
+Signed-off-by: Joel Fernandes (Google) <joel at joelfernandes.org>
 ---
  include/linux/srcu.h | 5 +++++
  1 file changed, 5 insertions(+)
@@ -36,4 +36,9 @@ index 2ec618979b20..a1c4947be877 100644
   * srcu_read_lock - register a new reader for an SRCU-protected structure.
   * @sp: srcu_struct in which to register the new reader.
 -- 
-2.17.0.441.gb46fe60e1d-goog
\ No newline at end of file
+2.17.0.441.gb46fe60e1d-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 e3ae1c6..95a9942 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
   "ref\00020180524012157.181277-1-joel\@joelfernandes.org\0"
 ]
 [
-  "From\0Joel Fernandes <joelaf\@google.com>\0"
+  "From\0joelaf at google.com (Joel Fernandes)\0"
 ]
 [
   "Subject\0[PATCH v7 3/8] srcu: Add notrace variant of srcu_dereference\0"
@@ -10,29 +10,6 @@
 [
   "Date\0Wed, 23 May 2018 18:21:52 -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",
   "In the last patch in this series, we are making lockdep register hooks\n",
   "onto the irq_{disable,enable} tracepoints. These tracepoints use the\n",
@@ -55,8 +32,8 @@
   "otherwise we get lockdep splats. This patch adds the needed\n",
   "srcu_dereference_notrace variant.\n",
   "\n",
-  "Reviewed-by: Paul E. McKenney <paulmck\@linux.vnet.ibm.com>\n",
-  "Signed-off-by: Joel Fernandes (Google) <joel\@joelfernandes.org>\n",
+  "Reviewed-by: Paul E. McKenney <paulmck at linux.vnet.ibm.com>\n",
+  "Signed-off-by: Joel Fernandes (Google) <joel at joelfernandes.org>\n",
   "---\n",
   " include/linux/srcu.h | 5 +++++\n",
   " 1 file changed, 5 insertions(+)\n",
@@ -78,7 +55,12 @@
   "  * srcu_read_lock - register a new reader for an SRCU-protected structure.\n",
   "  * \@sp: srcu_struct in which to register the new reader.\n",
   "-- \n",
-  "2.17.0.441.gb46fe60e1d-goog"
+  "2.17.0.441.gb46fe60e1d-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"
 ]
 
-c0909b70c33bcf45f175ede8ad1f90350c1b059604837f1d69caf8619732d5bb
+f3d95ac5d3e28e9c864e578407ab7dddfbce4953dd839bf1723f74642aa679d8
