diff for duplicates of <20170217094627.61844e29@eldfell>

diff --git a/a/1.1.hdr b/a/1.1.hdr
deleted file mode 100644
index bab376c..0000000
--- a/a/1.1.hdr
+++ /dev/null
@@ -1,2 +0,0 @@
-Content-Type: text/plain; charset=US-ASCII
-Content-Transfer-Encoding: quoted-printable
diff --git a/a/1.2.hdr b/a/1.2.hdr
deleted file mode 100644
index d21864c..0000000
--- a/a/1.2.hdr
+++ /dev/null
@@ -1,2 +0,0 @@
-Content-Type: application/pgp-signature
-Content-Description: OpenPGP digital signature
diff --git a/a/1.1.txt b/N1/1.txt
similarity index 94%
rename from a/1.1.txt
rename to N1/1.txt
index d3735c3..1a14227 100644
--- a/a/1.1.txt
+++ b/N1/1.txt
@@ -1,5 +1,5 @@
 On Thu, 16 Feb 2017 23:11:22 -0800
-Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org> wrote:
+Joe Perches <joe@perches.com> wrote:
 
 > To enable eventual removal of pr_warning
 > 
@@ -13,7 +13,7 @@ Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org> wrote:
 > o Coalesce a few formats and realign arguments
 > o Convert a couple of multiple line printks to single line
 > 
-> Signed-off-by: Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>
+> Signed-off-by: Joe Perches <joe@perches.com>
 > ---
 >  arch/x86/kernel/amd_gart_64.c          | 12 +++------
 >  arch/x86/kernel/apic/apic.c            | 46 ++++++++++++++++------------------
@@ -40,7 +40,7 @@ seems fine to me, even though I haven't been involved in the kernel
 side for years.
 
 For the hunks quoted below *only*:
-Reviewed-by: Pekka Paalanen <pekka.paalanen-ZGY8ohtN/8pPYcu2f3hruQ@public.gmane.org>
+Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
 
 > diff --git a/arch/x86/mm/kmmio.c b/arch/x86/mm/kmmio.c
 > index afc47f5c9531..ad70518cdcc7 100644
diff --git a/a/1.2.bin b/N1/2.bin
similarity index 100%
rename from a/1.2.bin
rename to N1/2.bin
diff --git a/a/2.hdr b/N1/2.hdr
index 5216513..d21864c 100644
--- a/a/2.hdr
+++ b/N1/2.hdr
@@ -1,4 +1,2 @@
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: base64
-Content-Disposition: inline
+Content-Type: application/pgp-signature
+Content-Description: OpenPGP digital signature
diff --git a/a/2.txt b/a/2.txt
deleted file mode 100644
index afde725..0000000
--- a/a/2.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-_______________________________________________
-Nouveau mailing list
-Nouveau@lists.freedesktop.org
-https://lists.freedesktop.org/mailman/listinfo/nouveau
diff --git a/a/content_digest b/N1/content_digest
index 32aad67..b1a1602 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,29 +1,29 @@
  "ref\0cover.1487314666.git.joe@perches.com\0"
  "ref\0be5fd9c52a11473a52e317b28cc32d2845def094.1487314667.git.joe@perches.com\0"
- "ref\0be5fd9c52a11473a52e317b28cc32d2845def094.1487314667.git.joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org\0"
- "From\0Pekka Paalanen <ppaalanen-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0"
+ "From\0Pekka Paalanen <ppaalanen@gmail.com>\0"
  "Subject\0Re: [PATCH 09/35] x86: Convert remaining uses of pr_warning to pr_warn\0"
  "Date\0Fri, 17 Feb 2017 09:46:27 +0200\0"
- "To\0Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>\0"
- "Cc\0Juergen Gross <jgross-IBi9RG/b67k@public.gmane.org>"
-  Robert Richter <rric-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
-  nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org
-  x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org
-  Steven Rostedt <rostedt-nx8X9YLhiw1AfugRpC6u6w@public.gmane.org>
-  linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-  Ning Sun <ning.sun-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>
-  tboot-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
-  oprofile-list-TtF/mJH4Jtrk1uMJSBkQmQ@public.gmane.org
-  H. Peter Anvin <hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org>
-  xen-devel-GuqFBffKawtpuQazS67q72D2FQJk+8+b@public.gmane.org
-  Boris Ostrovsky <boris.ostrovsky-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
-  sfi-devel-yLnuTTp1/kvcsJTPyzm5gB2eb7JE58TQ@public.gmane.org
-  Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>
- " Len Brown <lenb-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0"
- "\02:1.1\0"
+ "To\0Joe Perches <joe@perches.com>\0"
+ "Cc\0Ning Sun <ning.sun@intel.com>"
+  Steven Rostedt <rostedt@goodmis.org>
+  Karol Herbst <karolherbst@gmail.com>
+  Robert Richter <rric@kernel.org>
+  Len Brown <lenb@kernel.org>
+  Boris Ostrovsky <boris.ostrovsky@oracle.com>
+  Juergen Gross <jgross@suse.com>
+  Thomas Gleixner <tglx@linutronix.de>
+  H. Peter Anvin <hpa@zytor.com>
+  x86@kernel.org
+  linux-kernel@vger.kernel.org
+  tboot-devel@lists.sourceforge.net
+  nouveau@lists.freedesktop.org
+  oprofile-list@lists.sf.net
+  sfi-devel@simplefirmware.org
+ " xen-devel@lists.xenproject.org\0"
+ "\01:1\0"
  "b\0"
  "On Thu, 16 Feb 2017 23:11:22 -0800\n"
- "Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org> wrote:\n"
+ "Joe Perches <joe@perches.com> wrote:\n"
  "\n"
  "> To enable eventual removal of pr_warning\n"
  "> \n"
@@ -37,7 +37,7 @@
  "> o Coalesce a few formats and realign arguments\n"
  "> o Convert a couple of multiple line printks to single line\n"
  "> \n"
- "> Signed-off-by: Joe Perches <joe-6d6DIl74uiNBDgjK7y7TUQ@public.gmane.org>\n"
+ "> Signed-off-by: Joe Perches <joe@perches.com>\n"
  "> ---\n"
  ">  arch/x86/kernel/amd_gart_64.c          | 12 +++------\n"
  ">  arch/x86/kernel/apic/apic.c            | 46 ++++++++++++++++------------------\n"
@@ -64,7 +64,7 @@
  "side for years.\n"
  "\n"
  "For the hunks quoted below *only*:\n"
- "Reviewed-by: Pekka Paalanen <pekka.paalanen-ZGY8ohtN/8pPYcu2f3hruQ@public.gmane.org>\n"
+ "Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>\n"
  "\n"
  "> diff --git a/arch/x86/mm/kmmio.c b/arch/x86/mm/kmmio.c\n"
  "> index afc47f5c9531..ad70518cdcc7 100644\n"
@@ -136,7 +136,7 @@
  "\n"
  "Thanks,\n"
  pq
- "\02:1.2\0"
+ "\01:2\0"
  "d\0OpenPGP digital signature\0"
  "b\0"
  "-----BEGIN PGP SIGNATURE-----\n"
@@ -155,11 +155,5 @@
  "ge2RuTMqaBF9Lu/AybG1\n"
  "=DDNC\n"
  "-----END PGP SIGNATURE-----\n"
- "\01:2\0"
- "b\0"
- "_______________________________________________\n"
- "Nouveau mailing list\n"
- "Nouveau@lists.freedesktop.org\n"
- https://lists.freedesktop.org/mailman/listinfo/nouveau
 
-f04ae731e636fe5ca442970d6b70b30bcc2f3aadda3354732f62c577d75ea35b
+206afee99e6ed62b609caa7ccf0d9154f972df9a87e4b773158caa7a8d97f428
