diff for duplicates of <20190507174400.064350937@goodmis.org>

diff --git a/a/1.txt b/N1/1.txt
index e15af4d..e2f5516 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,22 +1,22 @@
-From: Josh Poimboeuf <jpoimboe@redhat.com>
+From: Josh Poimboeuf <jpoimboe at redhat.com>
 
 To allow an int3 handler to emulate a call instruction, it must be able to
 push a return address onto the stack. Add a gap to the stack to allow the
 int3 handler to push the return address and change the return from int3 to
 jump straight to the emulated called function target.
 
-Link: http://lkml.kernel.org/r/20181130183917.hxmti5josgq4clti@treble
-Link: http://lkml.kernel.org/r/20190502162133.GX2623@hirez.programming.kicks-ass.net
+Link: http://lkml.kernel.org/r/20181130183917.hxmti5josgq4clti at treble
+Link: http://lkml.kernel.org/r/20190502162133.GX2623 at hirez.programming.kicks-ass.net
 
 [
   Note, this is needed to allow Live Kernel Patching to not miss calling a
   patched function when tracing is enabled. -- Steven Rostedt
 ]
 
-Cc: stable@vger.kernel.org
+Cc: stable at vger.kernel.org
 Fixes: b700e7f03df5 ("livepatch: kernel: add support for live patching")
-Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
-Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+Signed-off-by: Josh Poimboeuf <jpoimboe at redhat.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt at goodmis.org>
 ---
  arch/x86/entry/entry_64.S | 18 ++++++++++++++++--
  1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/a/content_digest b/N1/content_digest
index f9df9e8..1081e54 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 1/3] x86_64: Add gap to int3 to allow for call emulation\0"
@@ -10,41 +10,6 @@
 [
   "Date\0Tue, 07 May 2019 13:42:28 -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,25 +17,25 @@
   "b\0"
 ]
 [
-  "From: Josh Poimboeuf <jpoimboe\@redhat.com>\n",
+  "From: Josh Poimboeuf <jpoimboe at redhat.com>\n",
   "\n",
   "To allow an int3 handler to emulate a call instruction, it must be able to\n",
   "push a return address onto the stack. Add a gap to the stack to allow the\n",
   "int3 handler to push the return address and change the return from int3 to\n",
   "jump straight to the emulated called function target.\n",
   "\n",
-  "Link: http://lkml.kernel.org/r/20181130183917.hxmti5josgq4clti\@treble\n",
-  "Link: http://lkml.kernel.org/r/20190502162133.GX2623\@hirez.programming.kicks-ass.net\n",
+  "Link: http://lkml.kernel.org/r/20181130183917.hxmti5josgq4clti at treble\n",
+  "Link: http://lkml.kernel.org/r/20190502162133.GX2623 at hirez.programming.kicks-ass.net\n",
   "\n",
   "[\n",
   "  Note, this is needed to allow Live Kernel Patching to not miss calling a\n",
   "  patched function when tracing is enabled. -- Steven Rostedt\n",
   "]\n",
   "\n",
-  "Cc: stable\@vger.kernel.org\n",
+  "Cc: stable at vger.kernel.org\n",
   "Fixes: b700e7f03df5 (\"livepatch: kernel: add support for live patching\")\n",
-  "Signed-off-by: Josh Poimboeuf <jpoimboe\@redhat.com>\n",
-  "Signed-off-by: Steven Rostedt (VMware) <rostedt\@goodmis.org>\n",
+  "Signed-off-by: Josh Poimboeuf <jpoimboe at redhat.com>\n",
+  "Signed-off-by: Steven Rostedt (VMware) <rostedt at goodmis.org>\n",
   "---\n",
   " arch/x86/entry/entry_64.S | 18 ++++++++++++++++--\n",
   " 1 file changed, 16 insertions(+), 2 deletions(-)\n",
@@ -122,4 +87,4 @@
   "2.20.1"
 ]
 
-6a68efbce1cbed0b0e77e082089224fcc219ef3275538ea6de65de5a1e7d6644
+2ee699550d880a3d553d8491fa7e44cd9ecc9af807c605732a347009082e0bdd
