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

diff --git a/a/1.txt b/N1/1.txt
index af82435..f0134f9 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -7,30 +7,30 @@ instruction pointer, in the __rseq_table section. This section allows
 debuggers may know where to place breakpoints when single-stepping
 through assembly blocks which may be aborted at any point by the kernel.
 
-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:
 - Provide abort-ip signature: The abort-ip signature is located just
@@ -101,7 +101,7 @@ index 000000000000..3b055f9aeaab
 +/*
 + * rseq-arm.h
 + *
-+ * (C) Copyright 2016-2018 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
++ * (C) Copyright 2016-2018 - Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
 + */
 +
 +#define RSEQ_SIG	0x53053053
@@ -822,8 +822,8 @@ index 000000000000..52630c9f42be
 +/*
 + * rseq-ppc.h
 + *
-+ * (C) Copyright 2016-2018 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-+ * (C) Copyright 2016-2018 - Boqun Feng <boqun.feng@gmail.com>
++ * (C) Copyright 2016-2018 - Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
++ * (C) Copyright 2016-2018 - Boqun Feng <boqun.feng at gmail.com>
 + */
 +
 +#define RSEQ_SIG	0x53053053
@@ -1499,7 +1499,7 @@ index 000000000000..72750b5905a9
 +/*
 + * rseq-skip.h
 + *
-+ * (C) Copyright 2017-2018 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
++ * (C) Copyright 2017-2018 - Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
 + */
 +
 +static inline __attribute__((always_inline))
@@ -1570,7 +1570,7 @@ index 000000000000..089410a314e9
 +/*
 + * rseq-x86.h
 + *
-+ * (C) Copyright 2016-2018 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
++ * (C) Copyright 2016-2018 - Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
 + */
 +
 +#include <stdint.h>
@@ -2708,7 +2708,7 @@ index 000000000000..4847e97ed049
 +/*
 + * rseq.c
 + *
-+ * Copyright (C) 2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
++ * Copyright (C) 2016 Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
 + *
 + * This library is free software; you can redistribute it and/or
 + * modify it under the terms of the GNU Lesser General Public
@@ -2831,7 +2831,7 @@ index 000000000000..0a808575cbc4
 +/*
 + * rseq.h
 + *
-+ * (C) Copyright 2016-2018 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
++ * (C) Copyright 2016-2018 - Mathieu Desnoyers <mathieu.desnoyers at efficios.com>
 + */
 +
 +#ifndef RSEQ_H
@@ -2975,4 +2975,9 @@ index 000000000000..0a808575cbc4
 +
 +#endif  /* RSEQ_H_ */
 -- 
-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 37ffb05..5a6718f 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 10/14] rseq: selftests: Provide rseq library (v5)\0"
@@ -10,37 +10,6 @@
 [
   "Date\0Mon, 30 Apr 2018 18:44:29 -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"
 ]
@@ -57,30 +26,30 @@
   "debuggers may know where to place breakpoints when single-stepping\n",
   "through assembly blocks which may be aborted at any point by the kernel.\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",
   "- Provide abort-ip signature: The abort-ip signature is located just\n",
@@ -151,7 +120,7 @@
   "+/*\n",
   "+ * rseq-arm.h\n",
   "+ *\n",
-  "+ * (C) Copyright 2016-2018 - Mathieu Desnoyers <mathieu.desnoyers\@efficios.com>\n",
+  "+ * (C) Copyright 2016-2018 - Mathieu Desnoyers <mathieu.desnoyers at efficios.com>\n",
   "+ */\n",
   "+\n",
   "+#define RSEQ_SIG\t0x53053053\n",
@@ -872,8 +841,8 @@
   "+/*\n",
   "+ * rseq-ppc.h\n",
   "+ *\n",
-  "+ * (C) Copyright 2016-2018 - Mathieu Desnoyers <mathieu.desnoyers\@efficios.com>\n",
-  "+ * (C) Copyright 2016-2018 - Boqun Feng <boqun.feng\@gmail.com>\n",
+  "+ * (C) Copyright 2016-2018 - Mathieu Desnoyers <mathieu.desnoyers at efficios.com>\n",
+  "+ * (C) Copyright 2016-2018 - Boqun Feng <boqun.feng at gmail.com>\n",
   "+ */\n",
   "+\n",
   "+#define RSEQ_SIG\t0x53053053\n",
@@ -1549,7 +1518,7 @@
   "+/*\n",
   "+ * rseq-skip.h\n",
   "+ *\n",
-  "+ * (C) Copyright 2017-2018 - Mathieu Desnoyers <mathieu.desnoyers\@efficios.com>\n",
+  "+ * (C) Copyright 2017-2018 - Mathieu Desnoyers <mathieu.desnoyers at efficios.com>\n",
   "+ */\n",
   "+\n",
   "+static inline __attribute__((always_inline))\n",
@@ -1620,7 +1589,7 @@
   "+/*\n",
   "+ * rseq-x86.h\n",
   "+ *\n",
-  "+ * (C) Copyright 2016-2018 - Mathieu Desnoyers <mathieu.desnoyers\@efficios.com>\n",
+  "+ * (C) Copyright 2016-2018 - Mathieu Desnoyers <mathieu.desnoyers at efficios.com>\n",
   "+ */\n",
   "+\n",
   "+#include <stdint.h>\n",
@@ -2758,7 +2727,7 @@
   "+/*\n",
   "+ * rseq.c\n",
   "+ *\n",
-  "+ * Copyright (C) 2016 Mathieu Desnoyers <mathieu.desnoyers\@efficios.com>\n",
+  "+ * Copyright (C) 2016 Mathieu Desnoyers <mathieu.desnoyers at efficios.com>\n",
   "+ *\n",
   "+ * This library is free software; you can redistribute it and/or\n",
   "+ * modify it under the terms of the GNU Lesser General Public\n",
@@ -2881,7 +2850,7 @@
   "+/*\n",
   "+ * rseq.h\n",
   "+ *\n",
-  "+ * (C) Copyright 2016-2018 - Mathieu Desnoyers <mathieu.desnoyers\@efficios.com>\n",
+  "+ * (C) Copyright 2016-2018 - Mathieu Desnoyers <mathieu.desnoyers at efficios.com>\n",
   "+ */\n",
   "+\n",
   "+#ifndef RSEQ_H\n",
@@ -3025,7 +2994,12 @@
   "+\n",
   "+#endif  /* RSEQ_H_ */\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"
 ]
 
-e7cde4eb0341ef6af47465f2d3dbf399368c3f92327fa0f183bf5831f0081d22
+50a289b94579d9dc3ceef32f4a296ce14743135e3a32332eb1ca576e5cbb48f6
