diff for duplicates of <20191219183116.739455056@linuxfoundation.org>

diff --git a/a/1.txt b/N1/1.txt
index e7c4573..8d627d9 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -104,10 +104,3 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +
  #define MGAG200_TYPE_MASK	(0x000000ff)
  #define MGAG200_FLAG_MASK	(0x00ffff00)
- 
-
-
-_______________________________________________
-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 1513a26..bc4f5f1 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -3,20 +3,23 @@
  "Subject\0[PATCH 5.4 48/80] drm/mgag200: Add workaround for HW that does not support startadd\0"
  "Date\0Thu, 19 Dec 2019 19:34:40 +0100\0"
  "To\0linux-kernel@vger.kernel.org\0"
- "Cc\0John Donnelly <john.p.donnelly@oracle.com>"
-  Neil Armstrong <narmstrong@baylibre.com>
-  David Airlie <airlied@linux.ie>
-  Daniel Vetter <daniel.vetter@ffwll.ch>
-  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>
-  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
- " Jos\303\251 Roberto de Souza <jose.souza@intel.com>"
+  John Donnelly <john.p.donnelly@oracle.com>
+  Daniel Vetter <daniel.vetter@ffwll.ch>
+  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>
+  Y.C. Chen <yc_chen@aspeedtech.com>
+  Neil Armstrong <narmstrong@baylibre.com>
   Thomas Gleixner <tglx@linutronix.de>
- " Sam Ravnborg <sam@ravnborg.org>\0"
+ " 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"
@@ -124,13 +127,6 @@
  "+#define MGAG200_FLAG_HW_BUG_NO_STARTADD\t(1ul << 8)\n"
  "+\n"
  " #define MGAG200_TYPE_MASK\t(0x000000ff)\n"
- " #define MGAG200_FLAG_MASK\t(0x00ffff00)\n"
- " \n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "dri-devel mailing list\n"
- "dri-devel@lists.freedesktop.org\n"
- https://lists.freedesktop.org/mailman/listinfo/dri-devel
+ " #define MGAG200_FLAG_MASK\t(0x00ffff00)"
 
-2813509187b4cad5b5e85576db9a5000352a1c24e7a6dddc33c037e2a1238b90
+fe506e9cb64d22924ba110b0551c8b9d5f2147bd56aaff684672551405190d94
