diff for duplicates of <20180430224433.17407-15-mathieu.desnoyers@efficios.com>

diff --git a/a/1.txt b/N1/1.txt
index edcafb8..a73c972 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -3,30 +3,30 @@ tests.
 
 Wire up the rseq Makefile, add directory entry into MAINTAINERS file.
 
-Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-CC: Shuah Khan <shuahkh@osg.samsung.com>
-CC: Russell King <linux@arm.linux.org.uk>
-CC: Catalin Marinas <catalin.marinas@arm.com>
-CC: Will Deacon <will.deacon@arm.com>
-CC: Thomas Gleixner <tglx@linutronix.de>
-CC: Paul Turner <pjt@google.com>
-CC: Andrew Hunter <ahh@google.com>
-CC: Peter Zijlstra <peterz@infradead.org>
-CC: Andy Lutomirski <luto@amacapital.net>
-CC: Andi Kleen <andi@firstfloor.org>
-CC: Dave Watson <davejwatson@fb.com>
-CC: Chris Lameter <cl@linux.com>
-CC: Ingo Molnar <mingo@redhat.com>
-CC: "H. Peter Anvin" <hpa@zytor.com>
-CC: Ben Maurer <bmaurer@fb.com>
-CC: Steven Rostedt <rostedt@goodmis.org>
-CC: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
-CC: Josh Triplett <josh@joshtriplett.org>
-CC: Linus Torvalds <torvalds@linux-foundation.org>
-CC: Andrew Morton <akpm@linux-foundation.org>
-CC: Boqun Feng <boqun.feng@gmail.com>
-CC: linux-kselftest@vger.kernel.org
-CC: linux-api@vger.kernel.org
+Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
+CC: Shuah Khan <shuahkh at osg.samsung.com>
+CC: Russell King <linux at arm.linux.org.uk>
+CC: Catalin Marinas <catalin.marinas at arm.com>
+CC: Will Deacon <will.deacon at arm.com>
+CC: Thomas Gleixner <tglx at linutronix.de>
+CC: Paul Turner <pjt at google.com>
+CC: Andrew Hunter <ahh at google.com>
+CC: Peter Zijlstra <peterz at infradead.org>
+CC: Andy Lutomirski <luto at amacapital.net>
+CC: Andi Kleen <andi at firstfloor.org>
+CC: Dave Watson <davejwatson at fb.com>
+CC: Chris Lameter <cl at linux.com>
+CC: Ingo Molnar <mingo at redhat.com>
+CC: "H. Peter Anvin" <hpa at zytor.com>
+CC: Ben Maurer <bmaurer at fb.com>
+CC: Steven Rostedt <rostedt at goodmis.org>
+CC: "Paul E. McKenney" <paulmck at linux.vnet.ibm.com>
+CC: Josh Triplett <josh at joshtriplett.org>
+CC: Linus Torvalds <torvalds at linux-foundation.org>
+CC: Andrew Morton <akpm at linux-foundation.org>
+CC: Boqun Feng <boqun.feng at gmail.com>
+CC: linux-kselftest at vger.kernel.org
+CC: linux-api at vger.kernel.org
 ---
 Changes since v1:
 - Use only rseq, remove use of cpu_opv.
@@ -52,7 +52,7 @@ index 4d61ce154dfc..5e8968b3ccae 100644
 +F:	tools/testing/selftests/rseq/
  
  RFKILL
- M:	Johannes Berg <johannes@sipsolutions.net>
+ M:	Johannes Berg <johannes at sipsolutions.net>
 diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile
 index 32aafa92074c..593fb44c9cd4 100644
 --- a/tools/testing/selftests/Makefile
@@ -241,4 +241,9 @@ index 000000000000..3acd6d75ff9f
 +echo "Sleep injection (1ms, 100%)"
 +inject_blocking -m 1 -s 1
 -- 
-2.11.0
\ No newline at end of file
+2.11.0
+
+--
+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 a9d986d..1ae58c9 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
   "ref\00020180430224433.17407-1-mathieu.desnoyers\@efficios.com\0"
 ]
 [
-  "From\0Mathieu Desnoyers <mathieu.desnoyers\@efficios.com>\0"
+  "From\0mathieu.desnoyers at efficios.com (Mathieu Desnoyers)\0"
 ]
 [
   "Subject\0[PATCH 14/14] rseq: selftests: Provide Makefile, scripts, gitignore (v2)\0"
@@ -10,37 +10,6 @@
 [
   "Date\0Mon, 30 Apr 2018 18:44:33 -0400\0"
 ]
-[
-  "To\0Peter Zijlstra <peterz\@infradead.org>",
-  " Paul E . McKenney <paulmck\@linux.vnet.ibm.com>",
-  " Boqun Feng <boqun.feng\@gmail.com>",
-  " Andy Lutomirski <luto\@amacapital.net>",
-  " Dave Watson <davejwatson\@fb.com>\0"
-]
-[
-  "Cc\0linux-kernel\@vger.kernel.org",
-  " linux-api\@vger.kernel.org",
-  " Paul Turner <pjt\@google.com>",
-  " Andrew Morton <akpm\@linux-foundation.org>",
-  " Russell King <linux\@arm.linux.org.uk>",
-  " Thomas Gleixner <tglx\@linutronix.de>",
-  " Ingo Molnar <mingo\@redhat.com>",
-  " H . Peter Anvin <hpa\@zytor.com>",
-  " Andrew Hunter <ahh\@google.com>",
-  " Andi Kleen <andi\@firstfloor.org>",
-  " Chris Lameter <cl\@linux.com>",
-  " Ben Maurer <bmaurer\@fb.com>",
-  " Steven Rostedt <rostedt\@goodmis.org>",
-  " Josh Triplett <josh\@joshtriplett.org>",
-  " Linus Torvalds <torvalds\@linux-foundation.org>",
-  " Catalin Marinas <catalin.marinas\@arm.com>",
-  " Will Deacon <will.deacon\@arm.com>",
-  " Michael Kerrisk <mtk.manpages\@gmail.com>",
-  " Joel Fernandes <joelaf\@google.com>",
-  " Mathieu Desnoyers <mathieu.desnoyers\@efficios.com>",
-  " Shuah Khan <shuahkh\@osg.samsung.com>",
-  " linux-kselftest\@vger.kernel.org\0"
-]
 [
   "\0000:1\0"
 ]
@@ -53,30 +22,30 @@
   "\n",
   "Wire up the rseq Makefile, add directory entry into MAINTAINERS file.\n",
   "\n",
-  "Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers\@efficios.com>\n",
-  "CC: Shuah Khan <shuahkh\@osg.samsung.com>\n",
-  "CC: Russell King <linux\@arm.linux.org.uk>\n",
-  "CC: Catalin Marinas <catalin.marinas\@arm.com>\n",
-  "CC: Will Deacon <will.deacon\@arm.com>\n",
-  "CC: Thomas Gleixner <tglx\@linutronix.de>\n",
-  "CC: Paul Turner <pjt\@google.com>\n",
-  "CC: Andrew Hunter <ahh\@google.com>\n",
-  "CC: Peter Zijlstra <peterz\@infradead.org>\n",
-  "CC: Andy Lutomirski <luto\@amacapital.net>\n",
-  "CC: Andi Kleen <andi\@firstfloor.org>\n",
-  "CC: Dave Watson <davejwatson\@fb.com>\n",
-  "CC: Chris Lameter <cl\@linux.com>\n",
-  "CC: Ingo Molnar <mingo\@redhat.com>\n",
-  "CC: \"H. Peter Anvin\" <hpa\@zytor.com>\n",
-  "CC: Ben Maurer <bmaurer\@fb.com>\n",
-  "CC: Steven Rostedt <rostedt\@goodmis.org>\n",
-  "CC: \"Paul E. McKenney\" <paulmck\@linux.vnet.ibm.com>\n",
-  "CC: Josh Triplett <josh\@joshtriplett.org>\n",
-  "CC: Linus Torvalds <torvalds\@linux-foundation.org>\n",
-  "CC: Andrew Morton <akpm\@linux-foundation.org>\n",
-  "CC: Boqun Feng <boqun.feng\@gmail.com>\n",
-  "CC: linux-kselftest\@vger.kernel.org\n",
-  "CC: linux-api\@vger.kernel.org\n",
+  "Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers at efficios.com>\n",
+  "CC: Shuah Khan <shuahkh at osg.samsung.com>\n",
+  "CC: Russell King <linux at arm.linux.org.uk>\n",
+  "CC: Catalin Marinas <catalin.marinas at arm.com>\n",
+  "CC: Will Deacon <will.deacon at arm.com>\n",
+  "CC: Thomas Gleixner <tglx at linutronix.de>\n",
+  "CC: Paul Turner <pjt at google.com>\n",
+  "CC: Andrew Hunter <ahh at google.com>\n",
+  "CC: Peter Zijlstra <peterz at infradead.org>\n",
+  "CC: Andy Lutomirski <luto at amacapital.net>\n",
+  "CC: Andi Kleen <andi at firstfloor.org>\n",
+  "CC: Dave Watson <davejwatson at fb.com>\n",
+  "CC: Chris Lameter <cl at linux.com>\n",
+  "CC: Ingo Molnar <mingo at redhat.com>\n",
+  "CC: \"H. Peter Anvin\" <hpa at zytor.com>\n",
+  "CC: Ben Maurer <bmaurer at fb.com>\n",
+  "CC: Steven Rostedt <rostedt at goodmis.org>\n",
+  "CC: \"Paul E. McKenney\" <paulmck at linux.vnet.ibm.com>\n",
+  "CC: Josh Triplett <josh at joshtriplett.org>\n",
+  "CC: Linus Torvalds <torvalds at linux-foundation.org>\n",
+  "CC: Andrew Morton <akpm at linux-foundation.org>\n",
+  "CC: Boqun Feng <boqun.feng at gmail.com>\n",
+  "CC: linux-kselftest at vger.kernel.org\n",
+  "CC: linux-api at vger.kernel.org\n",
   "---\n",
   "Changes since v1:\n",
   "- Use only rseq, remove use of cpu_opv.\n",
@@ -102,7 +71,7 @@
   "+F:\ttools/testing/selftests/rseq/\n",
   " \n",
   " RFKILL\n",
-  " M:\tJohannes Berg <johannes\@sipsolutions.net>\n",
+  " M:\tJohannes Berg <johannes at sipsolutions.net>\n",
   "diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile\n",
   "index 32aafa92074c..593fb44c9cd4 100644\n",
   "--- a/tools/testing/selftests/Makefile\n",
@@ -291,7 +260,12 @@
   "+echo \"Sleep injection (1ms, 100%)\"\n",
   "+inject_blocking -m 1 -s 1\n",
   "-- \n",
-  "2.11.0"
+  "2.11.0\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"
 ]
 
-c0c1dadcd9b22a5ee531ce7114848e8252ddf70907db1cf66074db64ce2a667d
+a01af84e1af9a08abbb7a5b6487b26d3007cc88dbc0140501b3c3bf87dbded27
