diff for duplicates of <20210715182624.964000017@linuxfoundation.org>

diff --git a/a/1.txt b/N1/1.txt
index 2507d9c..16fb407 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -40,9 +40,3 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
  	if (drm->client.device.info.chipset < 0x11)
  		dev->mode_config.async_page_flip = false;
-
-
-_______________________________________________
-Nouveau mailing list
-Nouveau@lists.freedesktop.org
-https://lists.freedesktop.org/mailman/listinfo/nouveau
diff --git a/a/content_digest b/N1/content_digest
index 014d3df..3c9eca1 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,14 +1,15 @@
  "ref\020210715182551.731989182@linuxfoundation.org\0"
  "From\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>\0"
- "Subject\0[Nouveau] [PATCH 5.12 180/242] drm/nouveau: Dont set allow_fb_modifiers explicitly\0"
+ "Subject\0[PATCH 5.12 180/242] drm/nouveau: Dont set allow_fb_modifiers explicitly\0"
  "Date\0Thu, 15 Jul 2021 20:39:02 +0200\0"
  "To\0linux-kernel@vger.kernel.org\0"
  "Cc\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
   stable@vger.kernel.org
-  Ben Skeggs <bskeggs@redhat.com>
+  Lyude Paul <lyude@redhat.com>
+  Pekka Paalanen <pekka.paalanen@collabora.com>
   Daniel Vetter <daniel.vetter@intel.com>
-  nouveau@lists.freedesktop.org
- " Pekka Paalanen <pekka.paalanen@collabora.com>\0"
+  Ben Skeggs <bskeggs@redhat.com>
+ " nouveau@lists.freedesktop.org\0"
  "\00:1\0"
  "b\0"
  "From: Daniel Vetter <daniel.vetter@ffwll.ch>\n"
@@ -52,12 +53,6 @@
  "-\tdev->mode_config.allow_fb_modifiers = true;\n"
  " \n"
  " \tif (drm->client.device.info.chipset < 0x11)\n"
- " \t\tdev->mode_config.async_page_flip = false;\n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "Nouveau mailing list\n"
- "Nouveau@lists.freedesktop.org\n"
- https://lists.freedesktop.org/mailman/listinfo/nouveau
+ " \t\tdev->mode_config.async_page_flip = false;"
 
-d5b052d37c38ac57c123e9467c6d4e2147704883a416b80780b2591c86962377
+ef7d76b34c0f433bbb89eb086a1ecb1ccff2cfe0cdf96bd03b5121d3c002b368
