diff for duplicates of <5643C607.60204@gmail.com>

diff --git a/a/1.1.hdr b/a/1.1.hdr
deleted file mode 100644
index afada38..0000000
--- a/a/1.1.hdr
+++ /dev/null
@@ -1,2 +0,0 @@
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: quoted-printable
diff --git a/a/1.2.hdr b/a/1.2.hdr
deleted file mode 100644
index a198b95..0000000
--- a/a/1.2.hdr
+++ /dev/null
@@ -1,3 +0,0 @@
-Content-Type: application/pgp-signature; name="signature.asc"
-Content-Description: OpenPGP digital signature
-Content-Disposition: attachment; filename="signature.asc"
diff --git a/a/1.1.txt b/N1/1.txt
similarity index 99%
rename from a/1.1.txt
rename to N1/1.txt
index b0dd406..6f62710 100644
--- a/a/1.1.txt
+++ b/N1/1.txt
@@ -15,7 +15,7 @@ On 11/11/2015 06:07 PM, Alexandre Courbot wrote:
 > This makes the IOMMU and DMA-API implementations of instmem diverge
 > enough that we should maybe put them into separate files...
 > 
-> Signed-off-by: Alexandre Courbot <acourbot-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
+> Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>
 > ---
 > Ben/Dave, since Dave's fix has reached mainline and builds are not
 > broken anymore, we can proceed one of two ways:
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..a198b95 100644
--- a/a/2.hdr
+++ b/N1/2.hdr
@@ -1,4 +1,3 @@
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: base64
-Content-Disposition: inline
+Content-Type: application/pgp-signature; name="signature.asc"
+Content-Description: OpenPGP digital signature
+Content-Disposition: attachment; filename="signature.asc"
diff --git a/a/2.txt b/a/2.txt
deleted file mode 100644
index c6b7f94..0000000
--- a/a/2.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-_______________________________________________
-Nouveau mailing list
-Nouveau@lists.freedesktop.org
-http://lists.freedesktop.org/mailman/listinfo/nouveau
diff --git a/a/content_digest b/N1/content_digest
index 1a5a4f4..d6efa2f 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,16 +1,15 @@
  "ref\01447229271-22901-1-git-send-email-acourbot@nvidia.com\0"
- "ref\01447229271-22901-1-git-send-email-acourbot-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org\0"
- "From\0Ben Skeggs <skeggsb-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0"
- "Subject\0Re: [PATCH] instmem/gk20a: use DMA API CPU mapping\0"
+ "From\0Ben Skeggs <skeggsb@gmail.com>\0"
+ "Subject\0Re: [Nouveau] [PATCH] instmem/gk20a: use DMA API CPU mapping\0"
  "Date\0Thu, 12 Nov 2015 08:49:43 +1000\0"
- "To\0Alexandre Courbot <acourbot-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>"
-  Ben Skeggs <bskeggs-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
- " Dave Airlie <airlied-cv59FeDIM0c@public.gmane.org>\0"
- "Cc\0nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org"
-  Andrew Morton <akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>
-  linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
- " Guenter Roeck <linux-0h96xk9xTtrk1uMJSBkQmQ@public.gmane.org>\0"
- "\02:1.1\0"
+ "To\0Alexandre Courbot <acourbot@nvidia.com>"
+  Ben Skeggs <bskeggs@redhat.com>
+ " Dave Airlie <airlied@linux.ie>\0"
+ "Cc\0nouveau@lists.freedesktop.org"
+  linux-kernel@vger.kernel.org
+  Andrew Morton <akpm@linux-foundation.org>
+ " Guenter Roeck <linux@roeck-us.net>\0"
+ "\01:1\0"
  "b\0"
  "On 11/11/2015 06:07 PM, Alexandre Courbot wrote:\n"
  "> Commit 69c4938249fb (\"drm/nouveau/instmem/gk20a: use direct CPU access\")\n"
@@ -29,7 +28,7 @@
  "> This makes the IOMMU and DMA-API implementations of instmem diverge\n"
  "> enough that we should maybe put them into separate files...\n"
  "> \n"
- "> Signed-off-by: Alexandre Courbot <acourbot-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>\n"
+ "> Signed-off-by: Alexandre Courbot <acourbot@nvidia.com>\n"
  "> ---\n"
  "> Ben/Dave, since Dave's fix has reached mainline and builds are not\n"
  "> broken anymore, we can proceed one of two ways:\n"
@@ -368,7 +367,7 @@
  ">   * PCI\n"
  ">   *****************************************************************************/\n"
  >
- "\02:1.2\0"
+ "\01:2\0"
  "fn\0signature.asc\0"
  "d\0OpenPGP digital signature\0"
  "b\0"
@@ -389,11 +388,5 @@
  "3g3AvQcrJX3clSOnpKiB\n"
  "=V8WX\n"
  "-----END PGP SIGNATURE-----\n"
- "\01:2\0"
- "b\0"
- "_______________________________________________\n"
- "Nouveau mailing list\n"
- "Nouveau@lists.freedesktop.org\n"
- http://lists.freedesktop.org/mailman/listinfo/nouveau
 
-19607566da4b0bbde4aa40aa438d6640ba83202562935c5a0836792a7c2b2b90
+0266c4ac36ac7acd76297094c0923d4a369d4c7d1446059217574a73e0a0e794
