diff for duplicates of <1637509.0BUGQyR5Xn@diego>

diff --git a/a/1.txt b/N1/1.txt
index 915ed8c..883b66a 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -46,9 +46,3 @@ Heiko
 
 
 [0] https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html#merge-criteria
-
-
-_______________________________________________
-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 3ef1937..0687769 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,15 +5,16 @@
  "Subject\0Re: [PATCH v4 2/2] drm/rockchip: vop: fix irq disabled after vop driver probed\0"
  "Date\0Mon, 18 Jun 2018 10:19:46 +0200\0"
  "To\0Marc Zyngier <marc.zyngier@arm.com>\0"
- "Cc\0robin.murphy@arm.com"
-  jeffy.chen@rock-chips.com
-  dri-devel@lists.freedesktop.org
-  tfiga@chromium.org
+ "Cc\0dri-devel@lists.freedesktop.org"
   linux-rockchip@lists.infradead.org
+  ezequiel@collabora.com
+  tfiga@chromium.org
+  robin.murphy@arm.com
+  jeffy.chen@rock-chips.com
+  hjc@rock-chips.com
   enric.balletbo@collabora.co.uk
-  stable@vger.kernel.org
   tomeu.vizoso@collabora.co.uk
- " ezequiel@collabora.com\0"
+ " stable@vger.kernel.org\0"
  "\00:1\0"
  "b\0"
  "Hi Marc,\n"
@@ -63,12 +64,6 @@
  "Heiko\n"
  "\n"
  "\n"
- "[0] https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html#merge-criteria\n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "dri-devel mailing list\n"
- "dri-devel@lists.freedesktop.org\n"
- https://lists.freedesktop.org/mailman/listinfo/dri-devel
+ [0] https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html#merge-criteria
 
-cd1f9e10c6ae1d080ae34a5f2a0abb471c80cff0293a38a2a99afd39f5f3ac26
+af0eeb1cbff33111371f8bbb9b1c27105df72757ff269c718570afd7f253a1e0
