diff for duplicates of <20210413145441.483977-3-maxime@cerno.tech>

diff --git a/a/1.txt b/N1/1.txt
index 50800e9..067c076 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -34,8 +34,3 @@ index 269390bc586e..f1f2e8cbce79 100644
  			if (vc4_encoder->type == encoder_types[i]) {
 -- 
 2.30.2
-
-_______________________________________________
-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 cb2272b..5aca2ef 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -6,15 +6,15 @@
   Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
   Thomas Zimmermann <tzimmermann@suse.de>
  " Maxime Ripard <maxime@cerno.tech>\0"
- "Cc\0Tim Gover <tim.gover@raspberrypi.com>"
+ "Cc\0Phil Elwell <phil@raspberrypi.com>"
+  Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
+  Tim Gover <tim.gover@raspberrypi.com>
+  linux-rpi-kernel@lists.infradead.org
   Dave Stevenson <dave.stevenson@raspberrypi.com>
+  Daniel Vetter <daniel.vetter@intel.com>
   David Airlie <airlied@linux.ie>
-  stable@vger.kernel.org
   bcm-kernel-feedback-list@broadcom.com
-  linux-rpi-kernel@lists.infradead.org
-  Daniel Vetter <daniel.vetter@intel.com>
-  Phil Elwell <phil@raspberrypi.com>
- " Nicolas Saenz Julienne <nsaenzjulienne@suse.de>\0"
+ " stable@vger.kernel.org\0"
  "\00:1\0"
  "b\0"
  "The vc4_set_crtc_possible_masks is meant to run over all the encoders\n"
@@ -52,11 +52,6 @@
  " \t\tfor (i = 0; i < ARRAY_SIZE(pv_data->encoder_types); i++) {\n"
  " \t\t\tif (vc4_encoder->type == encoder_types[i]) {\n"
  "-- \n"
- "2.30.2\n"
- "\n"
- "_______________________________________________\n"
- "dri-devel mailing list\n"
- "dri-devel@lists.freedesktop.org\n"
- https://lists.freedesktop.org/mailman/listinfo/dri-devel
+ 2.30.2
 
-67fe9035990ab04fb202829eb7f7a59c1be7712b1be3a0ef7d9f0ee5ea0d4679
+8f6fc10d1b3a5063fb6cf1928fd879b32d443522c3465d62d9316f913fac48ff
