diff for duplicates of <20190507174400.219947724@goodmis.org>

diff --git a/a/1.txt b/N1/1.txt
index f059e53..5e2a084 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,4 +1,4 @@
-From: Peter Zijlstra <peterz@infradead.org>
+From: Peter Zijlstra <peterz at infradead.org>
 
 In order to allow breakpoints to emulate call functions, they need to push
 the return address onto the stack. But because the breakpoint exception
@@ -18,34 +18,34 @@ The helper functions were also added:
   int3_emulate_jmp(): changes the location of the regs->ip to return there.
   int3_emulate_call(): push the return address and change regs->ip
 
-Cc: Andy Lutomirski <luto@kernel.org>
-Cc: Nicolai Stange <nstange@suse.de>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: Ingo Molnar <mingo@redhat.com>
-Cc: Borislav Petkov <bp@alien8.de>
-Cc: "H. Peter Anvin" <hpa@zytor.com>
-Cc: the arch/x86 maintainers <x86@kernel.org>
-Cc: Josh Poimboeuf <jpoimboe@redhat.com>
-Cc: Jiri Kosina <jikos@kernel.org>
-Cc: Miroslav Benes <mbenes@suse.cz>
-Cc: Petr Mladek <pmladek@suse.com>
-Cc: Joe Lawrence <joe.lawrence@redhat.com>
-Cc: Shuah Khan <shuah@kernel.org>
-Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-Cc: Tim Chen <tim.c.chen@linux.intel.com>
-Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
-Cc: Mimi Zohar <zohar@linux.ibm.com>
-Cc: Juergen Gross <jgross@suse.com>
-Cc: Nick Desaulniers <ndesaulniers@google.com>
-Cc: Nayna Jain <nayna@linux.ibm.com>
-Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
-Cc: Joerg Roedel <jroedel@suse.de>
-Cc: "open list:KERNEL SELFTEST FRAMEWORK" <linux-kselftest@vger.kernel.org>
-Cc: stable@vger.kernel.org
+Cc: Andy Lutomirski <luto at kernel.org>
+Cc: Nicolai Stange <nstange at suse.de>
+Cc: Thomas Gleixner <tglx at linutronix.de>
+Cc: Ingo Molnar <mingo at redhat.com>
+Cc: Borislav Petkov <bp at alien8.de>
+Cc: "H. Peter Anvin" <hpa at zytor.com>
+Cc: the arch/x86 maintainers <x86 at kernel.org>
+Cc: Josh Poimboeuf <jpoimboe at redhat.com>
+Cc: Jiri Kosina <jikos at kernel.org>
+Cc: Miroslav Benes <mbenes at suse.cz>
+Cc: Petr Mladek <pmladek at suse.com>
+Cc: Joe Lawrence <joe.lawrence at redhat.com>
+Cc: Shuah Khan <shuah at kernel.org>
+Cc: Konrad Rzeszutek Wilk <konrad.wilk at oracle.com>
+Cc: Tim Chen <tim.c.chen at linux.intel.com>
+Cc: Sebastian Andrzej Siewior <bigeasy at linutronix.de>
+Cc: Mimi Zohar <zohar at linux.ibm.com>
+Cc: Juergen Gross <jgross at suse.com>
+Cc: Nick Desaulniers <ndesaulniers at google.com>
+Cc: Nayna Jain <nayna at linux.ibm.com>
+Cc: Masahiro Yamada <yamada.masahiro at socionext.com>
+Cc: Joerg Roedel <jroedel at suse.de>
+Cc: "open list:KERNEL SELFTEST FRAMEWORK" <linux-kselftest at vger.kernel.org>
+Cc: stable at vger.kernel.org
 Fixes: b700e7f03df5 ("livepatch: kernel: add support for live patching")
-Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
+Signed-off-by: Peter Zijlstra (Intel) <peterz at infradead.org>
 [ Modified to only work for x86_64 ]
-Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+Signed-off-by: Steven Rostedt (VMware) <rostedt at goodmis.org>
 ---
  arch/x86/include/asm/text-patching.h | 22 ++++++++++++++++++++++
  1 file changed, 22 insertions(+)
diff --git a/a/content_digest b/N1/content_digest
index a3be1bc..5b4ee10 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,7 +2,7 @@
   "ref\00020190507174227.673261270\@goodmis.org\0"
 ]
 [
-  "From\0Steven Rostedt <rostedt\@goodmis.org>\0"
+  "From\0rostedt at goodmis.org (Steven Rostedt)\0"
 ]
 [
   "Subject\0[RFC][PATCH 2/3] x86_64: Allow breakpoints to emulate call functions\0"
@@ -10,41 +10,6 @@
 [
   "Date\0Tue, 07 May 2019 13:42:29 -0400\0"
 ]
-[
-  "To\0linux-kernel\@vger.kernel.org\0"
-]
-[
-  "Cc\0Linus Torvalds <torvalds\@linux-foundation.org>",
-  " Peter Zijlstra <peterz\@infradead.org>",
-  " Andy Lutomirski <luto\@amacapital.net>",
-  " Ingo Molnar <mingo\@kernel.org>",
-  " Andrew Morton <akpm\@linux-foundation.org>",
-  " Andy Lutomirski <luto\@kernel.org>",
-  " Nicolai Stange <nstange\@suse.de>",
-  " Thomas Gleixner <tglx\@linutronix.de>",
-  " Ingo Molnar <mingo\@redhat.com>",
-  " Borislav Petkov <bp\@alien8.de>",
-  " H. Peter Anvin <hpa\@zytor.com>",
-  " the arch/x86 maintainers <x86\@kernel.org>",
-  " Josh Poimboeuf <jpoimboe\@redhat.com>",
-  " Jiri Kosina <jikos\@kernel.org>",
-  " Miroslav Benes <mbenes\@suse.cz>",
-  " Petr Mladek <pmladek\@suse.com>",
-  " Joe Lawrence <joe.lawrence\@redhat.com>",
-  " Shuah Khan <shuah\@kernel.org>",
-  " Konrad Rzeszutek Wilk <konrad.wilk\@oracle.com>",
-  " Tim Chen <tim.c.chen\@linux.intel.com>",
-  " Sebastian Andrzej Siewior <bigeasy\@linutronix.de>",
-  " Mimi Zohar <zohar\@linux.ibm.com>",
-  " Juergen Gross <jgross\@suse.com>",
-  " Nick Desaulniers <ndesaulniers\@google.com>",
-  " Nayna Jain <nayna\@linux.ibm.com>",
-  " Masahiro Yamada <yamada.masahiro\@socionext.com>",
-  " Joerg Roedel <jroedel\@suse.de>",
-  " open list:KERNEL SELFTEST FRAMEWORK <linux-kselftest\@vger.kernel.org>",
-  " stable <stable\@vger.kernel.org>",
-  " Masami Hiramatsu <mhiramat\@kernel.org>\0"
-]
 [
   "\0000:1\0"
 ]
@@ -52,7 +17,7 @@
   "b\0"
 ]
 [
-  "From: Peter Zijlstra <peterz\@infradead.org>\n",
+  "From: Peter Zijlstra <peterz at infradead.org>\n",
   "\n",
   "In order to allow breakpoints to emulate call functions, they need to push\n",
   "the return address onto the stack. But because the breakpoint exception\n",
@@ -72,34 +37,34 @@
   "  int3_emulate_jmp(): changes the location of the regs->ip to return there.\n",
   "  int3_emulate_call(): push the return address and change regs->ip\n",
   "\n",
-  "Cc: Andy Lutomirski <luto\@kernel.org>\n",
-  "Cc: Nicolai Stange <nstange\@suse.de>\n",
-  "Cc: Thomas Gleixner <tglx\@linutronix.de>\n",
-  "Cc: Ingo Molnar <mingo\@redhat.com>\n",
-  "Cc: Borislav Petkov <bp\@alien8.de>\n",
-  "Cc: \"H. Peter Anvin\" <hpa\@zytor.com>\n",
-  "Cc: the arch/x86 maintainers <x86\@kernel.org>\n",
-  "Cc: Josh Poimboeuf <jpoimboe\@redhat.com>\n",
-  "Cc: Jiri Kosina <jikos\@kernel.org>\n",
-  "Cc: Miroslav Benes <mbenes\@suse.cz>\n",
-  "Cc: Petr Mladek <pmladek\@suse.com>\n",
-  "Cc: Joe Lawrence <joe.lawrence\@redhat.com>\n",
-  "Cc: Shuah Khan <shuah\@kernel.org>\n",
-  "Cc: Konrad Rzeszutek Wilk <konrad.wilk\@oracle.com>\n",
-  "Cc: Tim Chen <tim.c.chen\@linux.intel.com>\n",
-  "Cc: Sebastian Andrzej Siewior <bigeasy\@linutronix.de>\n",
-  "Cc: Mimi Zohar <zohar\@linux.ibm.com>\n",
-  "Cc: Juergen Gross <jgross\@suse.com>\n",
-  "Cc: Nick Desaulniers <ndesaulniers\@google.com>\n",
-  "Cc: Nayna Jain <nayna\@linux.ibm.com>\n",
-  "Cc: Masahiro Yamada <yamada.masahiro\@socionext.com>\n",
-  "Cc: Joerg Roedel <jroedel\@suse.de>\n",
-  "Cc: \"open list:KERNEL SELFTEST FRAMEWORK\" <linux-kselftest\@vger.kernel.org>\n",
-  "Cc: stable\@vger.kernel.org\n",
+  "Cc: Andy Lutomirski <luto at kernel.org>\n",
+  "Cc: Nicolai Stange <nstange at suse.de>\n",
+  "Cc: Thomas Gleixner <tglx at linutronix.de>\n",
+  "Cc: Ingo Molnar <mingo at redhat.com>\n",
+  "Cc: Borislav Petkov <bp at alien8.de>\n",
+  "Cc: \"H. Peter Anvin\" <hpa at zytor.com>\n",
+  "Cc: the arch/x86 maintainers <x86 at kernel.org>\n",
+  "Cc: Josh Poimboeuf <jpoimboe at redhat.com>\n",
+  "Cc: Jiri Kosina <jikos at kernel.org>\n",
+  "Cc: Miroslav Benes <mbenes at suse.cz>\n",
+  "Cc: Petr Mladek <pmladek at suse.com>\n",
+  "Cc: Joe Lawrence <joe.lawrence at redhat.com>\n",
+  "Cc: Shuah Khan <shuah at kernel.org>\n",
+  "Cc: Konrad Rzeszutek Wilk <konrad.wilk at oracle.com>\n",
+  "Cc: Tim Chen <tim.c.chen at linux.intel.com>\n",
+  "Cc: Sebastian Andrzej Siewior <bigeasy at linutronix.de>\n",
+  "Cc: Mimi Zohar <zohar at linux.ibm.com>\n",
+  "Cc: Juergen Gross <jgross at suse.com>\n",
+  "Cc: Nick Desaulniers <ndesaulniers at google.com>\n",
+  "Cc: Nayna Jain <nayna at linux.ibm.com>\n",
+  "Cc: Masahiro Yamada <yamada.masahiro at socionext.com>\n",
+  "Cc: Joerg Roedel <jroedel at suse.de>\n",
+  "Cc: \"open list:KERNEL SELFTEST FRAMEWORK\" <linux-kselftest at vger.kernel.org>\n",
+  "Cc: stable at vger.kernel.org\n",
   "Fixes: b700e7f03df5 (\"livepatch: kernel: add support for live patching\")\n",
-  "Signed-off-by: Peter Zijlstra (Intel) <peterz\@infradead.org>\n",
+  "Signed-off-by: Peter Zijlstra (Intel) <peterz at infradead.org>\n",
   "[ Modified to only work for x86_64 ]\n",
-  "Signed-off-by: Steven Rostedt (VMware) <rostedt\@goodmis.org>\n",
+  "Signed-off-by: Steven Rostedt (VMware) <rostedt at goodmis.org>\n",
   "---\n",
   " arch/x86/include/asm/text-patching.h | 22 ++++++++++++++++++++++\n",
   " 1 file changed, 22 insertions(+)\n",
@@ -139,4 +104,4 @@
   "2.20.1"
 ]
 
-b80979bc89973990a2b9393b9c5b9dbd9d5d806ab826c0c012e518ab691f39da
+c719b0c8db4cd102333dec3284c00930e2766a16c3d857724e203606fad11e81
