diff for duplicates of <20190312073438.05ad8173@collabora.com>

diff --git a/a/1.txt b/N1/1.txt
index aa7d3bb..489a837 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -131,3 +131,9 @@ instead of new_state->fb after this point?
 >  }
 >  
 >  static const struct drm_plane_helper_funcs plane_helper_funcs = {
+
+
+_______________________________________________
+linux-arm-kernel mailing list
+linux-arm-kernel@lists.infradead.org
+http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/a/content_digest b/N1/content_digest
index d93a48b..faf2175 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -4,22 +4,22 @@
  "Subject\0Re: [PATCH v2 1/5] drm/rockchip: fix fb references in async update\0"
  "Date\0Tue, 12 Mar 2019 07:34:38 +0100\0"
  "To\0Helen Koike <helen.koike@collabora.com>\0"
- "Cc\0dri-devel@lists.freedesktop.org"
-  nicholas.kazlauskas@amd.com
-  andrey.grodzovsky@amd.com
+ "Cc\0andrey.grodzovsky@amd.com"
+ " St\303\251phane Marchesin <marcheu@google.com>"
+ " Heiko St\303\274bner <heiko@sntech.de>"
+  Sean Paul <seanpaul@google.com>
+  David Airlie <airlied@linux.ie>
   daniel.vetter@ffwll.ch
   linux-kernel@vger.kernel.org
+  dri-devel@lists.freedesktop.org
   Tomasz Figa <tfiga@chromium.org>
-  David Airlie <airlied@linux.ie>
-  Sean Paul <seanpaul@google.com>
+  linux-rockchip@lists.infradead.org
+  Sandy Huang <hjc@rock-chips.com>
+  Daniel Vetter <daniel@ffwll.ch>
   kernel@collabora.com
   harry.wentland@amd.com
- " St\303\251phane Marchesin <marcheu@google.com>"
-  Sandy Huang <hjc@rock-chips.com>
-  linux-rockchip@lists.infradead.org
- " Heiko St\303\274bner <heiko@sntech.de>"
-  linux-arm-kernel@lists.infradead.org
- " Daniel Vetter <daniel@ffwll.ch>\0"
+  nicholas.kazlauskas@amd.com
+ " linux-arm-kernel@lists.infradead.org\0"
  "\00:1\0"
  "b\0"
  "On Mon, 11 Mar 2019 23:21:59 -0300\n"
@@ -154,6 +154,12 @@
  "> +\tnew_state->fb = old_fb;\n"
  ">  }\n"
  ">  \n"
- >  static const struct drm_plane_helper_funcs plane_helper_funcs = {
+ ">  static const struct drm_plane_helper_funcs plane_helper_funcs = {\n"
+ "\n"
+ "\n"
+ "_______________________________________________\n"
+ "linux-arm-kernel mailing list\n"
+ "linux-arm-kernel@lists.infradead.org\n"
+ http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
 
-ebe59f1291d4c169d71e6f8042d2caa9a85572927a31e9171e5ed2718d667a4f
+7671beb5015ef4f19edc0fc0a6dd8958f8cabb4690e8ab305e4902d5bccbc48c
