diff for duplicates of <20191219183113.297293802@linuxfoundation.org>

diff --git a/a/1.txt b/N1/1.txt
index 78de250..54eb110 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -65,9 +65,3 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
  	/* Hardcode the number of CRTCs to 1 */
  	mdev->num_crtc = 1;
-
-
-_______________________________________________
-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 bdf66b3..6c3ebc3 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -3,20 +3,23 @@
  "Subject\0[PATCH 5.4 46/80] drm/mgag200: Extract device type from flags\0"
  "Date\0Thu, 19 Dec 2019 19:34:38 +0100\0"
  "To\0linux-kernel@vger.kernel.org\0"
- "Cc\0John Donnelly <john.p.donnelly@oracle.com>"
-  Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-  David Airlie <airlied@linux.ie>
-  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-  dri-devel@lists.freedesktop.org
+ "Cc\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
   stable@vger.kernel.org
-  Andrzej Pietrasiewicz <andrzej.p@collabora.com>
-  Gerd Hoffmann <kraxel@redhat.com>
   Thomas Zimmermann <tzimmermann@suse.de>
   Daniel Vetter <daniel.vetter@ffwll.ch>
- " Jos\303\251 Roberto de Souza <jose.souza@intel.com>"
+  John Donnelly <john.p.donnelly@oracle.com>
+  Gerd Hoffmann <kraxel@redhat.com>
   Dave Airlie <airlied@redhat.com>
+  Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
+  Maxime Ripard <mripard@kernel.org>
+  David Airlie <airlied@linux.ie>
   Sam Ravnborg <sam@ravnborg.org>
- " Emil Velikov <emil.velikov@collabora.com>\0"
+  Emil Velikov <emil.velikov@collabora.com>
+  Y.C. Chen <yc_chen@aspeedtech.com>
+  Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+ " Jos\303\251 Roberto de Souza <jose.souza@intel.com>"
+  Andrzej Pietrasiewicz <andrzej.p@collabora.com>
+ " dri-devel@lists.freedesktop.org\0"
  "\00:1\0"
  "b\0"
  "From: Thomas Zimmermann <tzimmermann@suse.de>\n"
@@ -85,12 +88,6 @@
  "+\tmdev->type = mgag200_type_from_driver_data(flags);\n"
  " \n"
  " \t/* Hardcode the number of CRTCs to 1 */\n"
- " \tmdev->num_crtc = 1;\n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "dri-devel mailing list\n"
- "dri-devel@lists.freedesktop.org\n"
- https://lists.freedesktop.org/mailman/listinfo/dri-devel
+ " \tmdev->num_crtc = 1;"
 
-eb4fc89b31b89d124fc2153e3da8a4ae8d8c8f1c165812eb650e088e23d39b52
+145e6f32b5fc7c4a7f7e43f2e2956e95cdffe00ed97674c55c20b29cdc9db42a
