diff for duplicates of <20210521090959.1663703-6-daniel.vetter@ffwll.ch>

diff --git a/a/1.txt b/N1/1.txt
index f2f0dcb..7e249cd 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -230,8 +230,3 @@ index 1acd15aa4193..217415ec8eea 100644
  	.atomic_disable = tidss_plane_atomic_disable,
 -- 
 2.31.0
-
-_______________________________________________
-Intel-gfx mailing list
-Intel-gfx@lists.freedesktop.org
-https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/a/content_digest b/N1/content_digest
index ce805cf..4d89392 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,7 +5,7 @@
   "From\0Daniel Vetter <daniel.vetter\@ffwll.ch>\0"
 ]
 [
-  "Subject\0[Intel-gfx] [PATCH 06/11] drm/<driver>: drm_gem_plane_helper_prepare_fb is now the default\0"
+  "Subject\0[PATCH 06/11] drm/<driver>: drm_gem_plane_helper_prepare_fb is now the default\0"
 ]
 [
   "Date\0Fri, 21 May 2021 11:09:54 +0200\0"
@@ -14,45 +14,45 @@
   "To\0DRI Development <dri-devel\@lists.freedesktop.org>\0"
 ]
 [
-  "Cc\0Heiko St\303\274bner <heiko\@sntech.de>",
-  " Neil Armstrong <narmstrong\@baylibre.com>",
+  "Cc\0Intel Graphics Development <intel-gfx\@lists.freedesktop.org>",
   " Daniel Vetter <daniel.vetter\@ffwll.ch>",
-  " Alexandre Torgue <alexandre.torgue\@foss.st.com>",
-  " Stefan Agner <stefan\@agner.ch>",
-  " linux-mips\@vger.kernel.org",
-  " Paul Cercueil <paul\@crapouillou.net>",
-  " Benjamin Gaignard <benjamin.gaignard\@linaro.org>",
   " Daniel Vetter <daniel.vetter\@intel.com>",
+  " Laurentiu Palcu <laurentiu.palcu\@oss.nxp.com>",
+  " Lucas Stach <l.stach\@pengutronix.de>",
+  " Shawn Guo <shawnguo\@kernel.org>",
+  " Sascha Hauer <s.hauer\@pengutronix.de>",
+  " Pengutronix Kernel Team <kernel\@pengutronix.de>",
   " Fabio Estevam <festevam\@gmail.com>",
-  " linux-stm32\@st-md-mailman.stormreply.com",
-  " Jerome Brunet <jbrunet\@baylibre.com>",
-  " Marek Vasut <marex\@denx.de>",
-  " Kevin Hilman <khilman\@baylibre.com>",
-  " Jernej Skrabec <jernej.skrabec\@gmail.com>",
-  " linux-rockchip\@lists.infradead.org",
-  " Chen-Yu Tsai <wens\@csie.org>",
   " NXP Linux Team <linux-imx\@nxp.com>",
-  " Sascha Hauer <s.hauer\@pengutronix.de>",
+  " Philipp Zabel <p.zabel\@pengutronix.de>",
+  " Paul Cercueil <paul\@crapouillou.net>",
   " Chun-Kuang Hu <chunkuang.hu\@kernel.org>",
-  " Pengutronix Kernel Team <kernel\@pengutronix.de>",
+  " Matthias Brugger <matthias.bgg\@gmail.com>",
+  " Neil Armstrong <narmstrong\@baylibre.com>",
+  " Kevin Hilman <khilman\@baylibre.com>",
+  " Jerome Brunet <jbrunet\@baylibre.com>",
   " Martin Blumenstingl <martin.blumenstingl\@googlemail.com>",
-  " Intel Graphics Development <intel-gfx\@lists.freedesktop.org>",
+  " Marek Vasut <marex\@denx.de>",
+  " Stefan Agner <stefan\@agner.ch>",
+  " Sandy Huang <hjc\@rock-chips.com>",
+  " Heiko St\303\274bner <heiko\@sntech.de>",
+  " Yannick Fertre <yannick.fertre\@foss.st.com>",
+  " Philippe Cornu <philippe.cornu\@foss.st.com>",
+  " Benjamin Gaignard <benjamin.gaignard\@linaro.org>",
+  " Maxime Coquelin <mcoquelin.stm32\@gmail.com>",
+  " Alexandre Torgue <alexandre.torgue\@foss.st.com>",
   " Maxime Ripard <mripard\@kernel.org>",
+  " Chen-Yu Tsai <wens\@csie.org>",
+  " Jernej Skrabec <jernej.skrabec\@gmail.com>",
+  " Jyri Sarha <jyri.sarha\@iki.fi>",
+  " Tomi Valkeinen <tomba\@kernel.org>",
+  " linux-arm-kernel\@lists.infradead.org",
+  " linux-mips\@vger.kernel.org",
   " linux-mediatek\@lists.infradead.org",
-  " Laurentiu Palcu <laurentiu.palcu\@oss.nxp.com>",
-  " Matthias Brugger <matthias.bgg\@gmail.com>",
   " linux-amlogic\@lists.infradead.org",
-  " linux-arm-kernel\@lists.infradead.org",
-  " Maxime Coquelin <mcoquelin.stm32\@gmail.com>",
-  " Tomi Valkeinen <tomba\@kernel.org>",
-  " Jyri Sarha <jyri.sarha\@iki.fi>",
-  " Yannick Fertre <yannick.fertre\@foss.st.com>",
-  " Sandy Huang <hjc\@rock-chips.com>",
-  " linux-sunxi\@lists.linux.dev",
-  " Philippe Cornu <philippe.cornu\@foss.st.com>",
-  " Philipp Zabel <p.zabel\@pengutronix.de>",
-  " Shawn Guo <shawnguo\@kernel.org>",
-  " Lucas Stach <l.stach\@pengutronix.de>\0"
+  " linux-rockchip\@lists.infradead.org",
+  " linux-stm32\@st-md-mailman.stormreply.com",
+  " linux-sunxi\@lists.linux.dev\0"
 ]
 [
   "\0000:1\0"
@@ -292,12 +292,7 @@
   " \t.atomic_update = tidss_plane_atomic_update,\n",
   " \t.atomic_disable = tidss_plane_atomic_disable,\n",
   "-- \n",
-  "2.31.0\n",
-  "\n",
-  "_______________________________________________\n",
-  "Intel-gfx mailing list\n",
-  "Intel-gfx\@lists.freedesktop.org\n",
-  "https://lists.freedesktop.org/mailman/listinfo/intel-gfx"
+  "2.31.0"
 ]
 
-0200ee2706d8bf80f4e692206ece94a9479385fd56f06c05c2c981218001cc5f
+1a663e7cd522144b6ac8f54a146a0aadf7b7760ddc50ad7f8983f0edaf34fa3d
