diff for duplicates of <2481825.ONQ5ft592J@diplodocus>

diff --git a/a/1.txt b/N1/1.txt
index f292b1d..107a750 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,9 +1,9 @@
 On Friday, November 18, 2016 10:33:42 AM Rob Herring wrote:
 > On Thu, Nov 17, 2016 at 08:44:32PM -0600, Robert Nelson wrote:
-> > Signed-off-by: Robert Nelson <robertcnelson-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
-> > CC: Christian Gmeiner <christian.gmeiner-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
-> > CC: Russell King <rmk+kernel-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>
-> > CC: Lucas Stach <l.stach-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
+> > Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+> > CC: Christian Gmeiner <christian.gmeiner@gmail.com>
+> > CC: Russell King <rmk+kernel@arm.linux.org.uk>
+> > CC: Lucas Stach <l.stach@pengutronix.de>
 > > ---
 > >  drivers/gpu/drm/etnaviv/Kconfig | 2 +-
 > >  1 file changed, 1 insertion(+), 1 deletion(-)
@@ -27,12 +27,12 @@ On Friday, November 18, 2016 10:33:42 AM Rob Herring wrote:
 > 
 > _______________________________________________
 > linux-arm-kernel mailing list
-> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org
+> linux-arm-kernel at lists.infradead.org
 > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
 ...building with ARCH=x86_64
             ^
-drivers/gpu/drm/etnaviv/etnaviv_gpu.c: In function ‘etnaviv_gpu_init’:
-drivers/gpu/drm/etnaviv/etnaviv_gpu.c:633:18: error: ‘PHYS_OFFSET’ undeclared (first use in this function)
+drivers/gpu/drm/etnaviv/etnaviv_gpu.c: In function ?etnaviv_gpu_init?:
+drivers/gpu/drm/etnaviv/etnaviv_gpu.c:633:18: error: ?PHYS_OFFSET? undeclared (first use in this function)
    if (dma_mask < PHYS_OFFSET + SZ_2G)
                   ^
 drivers/gpu/drm/etnaviv/etnaviv_gpu.c:633:18: note: each undeclared identifier is reported only once for each function it appears in
@@ -46,7 +46,7 @@ make: *** [Makefile:968: drivers] Error 2
 ...looks like this snippit is the only (compile time) problem:
  
  622         /*
- 623          * Set the GPU linear window to be at the end of the DMA window, where
+ 623          * Set the GPU linear window to be@the end of the DMA window, where
  624          * the CMA area is likely to reside. This ensures that we are able to
  625          * map the command buffers while having the linear window overlap as
  626          * much RAM as possible, so we can optimize mappings for other buffers.
@@ -64,7 +64,3 @@ make: *** [Makefile:968: drivers] Error 2
  638         }
 
 Joshua
---
-To unsubscribe from this list: send the line "unsubscribe devicetree" in
-the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff --git a/a/content_digest b/N1/content_digest
index 41baaee..e345425 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,26 +1,18 @@
  "ref\020161118024436.13447-1-robertcnelson@gmail.com\0"
  "ref\020161118024436.13447-2-robertcnelson@gmail.com\0"
  "ref\020161118163342.5t2tbsw54k2gmqe3@rob-hp-laptop\0"
- "From\0Joshua Clayton <stillcompiling-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\0"
- "Subject\0Re: [RFC 2/6] drm/etnaviv: allow building etnaviv on omap devices\0"
+ "From\0stillcompiling@gmail.com (Joshua Clayton)\0"
+ "Subject\0[RFC 2/6] drm/etnaviv: allow building etnaviv on omap devices\0"
  "Date\0Sat, 19 Nov 2016 03:58:15 -0800\0"
- "To\0linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0"
- "Cc\0Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>"
-  Robert Nelson <robertcnelson-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
-  devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
-  tony-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org
-  Christian Gmeiner <christian.gmeiner-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
-  Russell King <rmk+kernel-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>
-  linux-omap-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
- " Lucas Stach <l.stach-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Friday, November 18, 2016 10:33:42 AM Rob Herring wrote:\n"
  "> On Thu, Nov 17, 2016 at 08:44:32PM -0600, Robert Nelson wrote:\n"
- "> > Signed-off-by: Robert Nelson <robertcnelson-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n"
- "> > CC: Christian Gmeiner <christian.gmeiner-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>\n"
- "> > CC: Russell King <rmk+kernel-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>\n"
- "> > CC: Lucas Stach <l.stach-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>\n"
+ "> > Signed-off-by: Robert Nelson <robertcnelson@gmail.com>\n"
+ "> > CC: Christian Gmeiner <christian.gmeiner@gmail.com>\n"
+ "> > CC: Russell King <rmk+kernel@arm.linux.org.uk>\n"
+ "> > CC: Lucas Stach <l.stach@pengutronix.de>\n"
  "> > ---\n"
  "> >  drivers/gpu/drm/etnaviv/Kconfig | 2 +-\n"
  "> >  1 file changed, 1 insertion(+), 1 deletion(-)\n"
@@ -44,12 +36,12 @@
  "> \n"
  "> _______________________________________________\n"
  "> linux-arm-kernel mailing list\n"
- "> linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\n"
+ "> linux-arm-kernel at lists.infradead.org\n"
  "> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel\n"
  "...building with ARCH=x86_64\n"
  "            ^\n"
- "drivers/gpu/drm/etnaviv/etnaviv_gpu.c: In function \342\200\230etnaviv_gpu_init\342\200\231:\n"
- "drivers/gpu/drm/etnaviv/etnaviv_gpu.c:633:18: error: \342\200\230PHYS_OFFSET\342\200\231 undeclared (first use in this function)\n"
+ "drivers/gpu/drm/etnaviv/etnaviv_gpu.c: In function ?etnaviv_gpu_init?:\n"
+ "drivers/gpu/drm/etnaviv/etnaviv_gpu.c:633:18: error: ?PHYS_OFFSET? undeclared (first use in this function)\n"
  "   if (dma_mask < PHYS_OFFSET + SZ_2G)\n"
  "                  ^\n"
  "drivers/gpu/drm/etnaviv/etnaviv_gpu.c:633:18: note: each undeclared identifier is reported only once for each function it appears in\n"
@@ -63,7 +55,7 @@
  "...looks like this snippit is the only (compile time) problem:\n"
  " \n"
  " 622         /*\n"
- " 623          * Set the GPU linear window to be at the end of the DMA window, where\n"
+ " 623          * Set the GPU linear window to be@the end of the DMA window, where\n"
  " 624          * the CMA area is likely to reside. This ensures that we are able to\n"
  " 625          * map the command buffers while having the linear window overlap as\n"
  " 626          * much RAM as possible, so we can optimize mappings for other buffers.\n"
@@ -80,10 +72,6 @@
  " 637                         gpu->memory_base = dma_mask - SZ_2G + 1;\n"
  " 638         }\n"
  "\n"
- "Joshua\n"
- "--\n"
- "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n"
- "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n"
- More majordomo info at  http://vger.kernel.org/majordomo-info.html
+ Joshua
 
-7cf9f63b0b7d4ae3f33471ee328ac02bc6413153ac11751d19296e19e6695926
+3db0e4692744c45035263187bab7c916dbd4972c02e3f1d65181ad600ab435a5
