diff for duplicates of <20190312170404.531087175@linuxfoundation.org>

diff --git a/a/1.txt b/N1/1.txt
index 115449c..4e2d515 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -75,9 +75,3 @@ Signed-off-by: Sasha Levin <sashal@kernel.org>
  #else
  	return true;
  #endif
-
-
-_______________________________________________
-dri-devel mailing list
-dri-devel@lists.freedesktop.org
-https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/a/content_digest b/N1/content_digest
index 17bae01..d7f373e 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -3,25 +3,29 @@
  "Subject\0[PATCH 5.0 13/25] drm: disable uncached DMA optimization for ARM and arm64\0"
  "Date\0Tue, 12 Mar 2019 10:08:51 -0700\0"
  "To\0linux-kernel@vger.kernel.org\0"
- "Cc\0Maxime Ripard <maxime.ripard@bootlin.com>"
-  Will Deacon <will.deacon@arm.com>
-  dri-devel <dri-devel@lists.freedesktop.org>
+ "Cc\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
+  stable@vger.kernel.org
+  Christian Koenig <christian.koenig@amd.com>
+  Alex Deucher <alexander.deucher@amd.com>
+  David Zhou <David1.Zhou@amd.com>
   Huang Rui <ray.huang@amd.com>
-  Sasha Levin <sashal@kernel.org>
-  Carsten Haitzler <Carsten.Haitzler@arm.com>
-  Michael Ellerman <mpe@ellerman.id.au>
-  amd-gfx list <amd-gfx@lists.freedesktop.org>
-  Christoph Hellwig <hch@infradead.org>
-  David Airlie <airlied@linux.ie>
   Junwei Zhang <Jerry.Zhang@amd.com>
-  Sean Paul <sean@poorly.run>
-  Ard Biesheuvel <ard.biesheuvel@linaro.org>
-  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
   Michel Daenzer <michel.daenzer@amd.com>
-  stable@vger.kernel.org
-  Alex Deucher <alexander.deucher@amd.com>
+  David Airlie <airlied@linux.ie>
+  Daniel Vetter <daniel@ffwll.ch>
+  Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
+  Maxime Ripard <maxime.ripard@bootlin.com>
+  Sean Paul <sean@poorly.run>
+  Michael Ellerman <mpe@ellerman.id.au>
+  Benjamin Herrenschmidt <benh@kernel.crashing.org>
+  Will Deacon <will.deacon@arm.com>
+  Christoph Hellwig <hch@infradead.org>
   Robin Murphy <robin.murphy@arm.com>
- " Christian Koenig <christian.koenig@amd.com>\0"
+  amd-gfx list <amd-gfx@lists.freedesktop.org>
+  dri-devel <dri-devel@lists.freedesktop.org>
+  Carsten Haitzler <Carsten.Haitzler@arm.com>
+  Ard Biesheuvel <ard.biesheuvel@linaro.org>
+ " Sasha Levin <sashal@kernel.org>\0"
  "\00:1\0"
  "b\0"
  "5.0-stable review patch.  If anyone has any objections, please let me know.\n"
@@ -100,12 +104,6 @@
  "+\treturn false;\n"
  " #else\n"
  " \treturn true;\n"
- " #endif\n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "dri-devel mailing list\n"
- "dri-devel@lists.freedesktop.org\n"
- https://lists.freedesktop.org/mailman/listinfo/dri-devel
+  #endif
 
-87f0680f4235050408c4bbd0a1d8781eb2fec293d280a679f77a2c7b4f2e0778
+55335e1420e0a37570ef9c093a3f12696524fbb8d71ba2e52c7052a02b5c495f
