diff for duplicates of <1816316.NCRF09CkBJ@phil>

diff --git a/a/1.txt b/N1/1.txt
index 3bcdbf1..b6b9278 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -31,11 +31,11 @@ Am Donnerstag, 20. Juli 2017, 10:43:32 CEST schrieb Mark Yao:
 With patches applied up to this one I end up with
 
   CC [M]  drivers/gpu/drm/rockchip/rockchip_drm_vop.o
-../drivers/gpu/drm/rockchip/rockchip_drm_vop.c: In function ‘vop_crtc_enable’:
+../drivers/gpu/drm/rockchip/rockchip_drm_vop.c: In function ?vop_crtc_enable?:
 ../drivers/gpu/drm/rockchip/rockchip_drm_vop.c:985:46: error: macro "VOP_INTR_SET" requires 4 arguments, but only 3 given
   VOP_INTR_SET(vop, line_flag_num[0], vact_end);
                                               ^
-../drivers/gpu/drm/rockchip/rockchip_drm_vop.c:985:2: error: ‘VOP_INTR_SET’ undeclared (first use in this function)
+../drivers/gpu/drm/rockchip/rockchip_drm_vop.c:985:2: error: ?VOP_INTR_SET? undeclared (first use in this function)
   VOP_INTR_SET(vop, line_flag_num[0], vact_end);
   ^~~~~~~~~~~~
 ../drivers/gpu/drm/rockchip/rockchip_drm_vop.c:985:2: note: each undeclared identifier is reported only once for each function it appears in
@@ -48,7 +48,3 @@ but this intermediate breakage should not happen, to keep bisectability.
 
 
 Heiko
-_______________________________________________
-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 2283c7d..9718441 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,13 +1,9 @@
  "ref\01500518564-30371-1-git-send-email-mark.yao@rock-chips.com\0"
  "ref\01500518613-30590-1-git-send-email-mark.yao@rock-chips.com\0"
- "From\0Heiko Stuebner <heiko@sntech.de>\0"
- "Subject\0Re: [PATCH v5 3/7] drm/rockchip: vop: move line_flag_num to interrupt registers\0"
+ "From\0heiko@sntech.de (Heiko Stuebner)\0"
+ "Subject\0[PATCH v5 3/7] drm/rockchip: vop: move line_flag_num to interrupt registers\0"
  "Date\0Tue, 25 Jul 2017 23:54:19 +0200\0"
- "To\0Mark Yao <mark.yao@rock-chips.com>\0"
- "Cc\0linux-rockchip@lists.infradead.org"
-  linux-arm-kernel@lists.infradead.org
-  dri-devel@lists.freedesktop.org
- " linux-kernel@vger.kernel.org\0"
+ "To\0linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "Hi Mark,\n"
@@ -43,11 +39,11 @@
  "With patches applied up to this one I end up with\n"
  "\n"
  "  CC [M]  drivers/gpu/drm/rockchip/rockchip_drm_vop.o\n"
- "../drivers/gpu/drm/rockchip/rockchip_drm_vop.c: In function \342\200\230vop_crtc_enable\342\200\231:\n"
+ "../drivers/gpu/drm/rockchip/rockchip_drm_vop.c: In function ?vop_crtc_enable?:\n"
  "../drivers/gpu/drm/rockchip/rockchip_drm_vop.c:985:46: error: macro \"VOP_INTR_SET\" requires 4 arguments, but only 3 given\n"
  "  VOP_INTR_SET(vop, line_flag_num[0], vact_end);\n"
  "                                              ^\n"
- "../drivers/gpu/drm/rockchip/rockchip_drm_vop.c:985:2: error: \342\200\230VOP_INTR_SET\342\200\231 undeclared (first use in this function)\n"
+ "../drivers/gpu/drm/rockchip/rockchip_drm_vop.c:985:2: error: ?VOP_INTR_SET? undeclared (first use in this function)\n"
  "  VOP_INTR_SET(vop, line_flag_num[0], vact_end);\n"
  "  ^~~~~~~~~~~~\n"
  "../drivers/gpu/drm/rockchip/rockchip_drm_vop.c:985:2: note: each undeclared identifier is reported only once for each function it appears in\n"
@@ -59,10 +55,6 @@
  "but this intermediate breakage should not happen, to keep bisectability.\n"
  "\n"
  "\n"
- "Heiko\n"
- "_______________________________________________\n"
- "dri-devel mailing list\n"
- "dri-devel@lists.freedesktop.org\n"
- https://lists.freedesktop.org/mailman/listinfo/dri-devel
+ Heiko
 
-f7854a53c7c553bf5289dba8bf031bfcdc05f9b320056b972b17da853734d902
+c440b10f4e3a1c32166470c2d27b3ac2606806cda0d0cf2bf60f46b0cf2c3305
