diff for duplicates of <20170622092249.31473903@bbrezillon>

diff --git a/a/1.txt b/N1/1.txt
index a3da89f..fff7443 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -34,8 +34,3 @@ Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com>
 >  	for_each_plane_in_state(state, plane, new_state, i) {
 >  		if ((plane->state->fb != new_state->fb) && new_state->fb) {
 >  			struct drm_gem_cma_object *cma_bo =
-
-_______________________________________________
-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 2fff7bb..07015df 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -4,8 +4,8 @@
  "Subject\0Re: [PATCH 2/4] drm/vc4: Wait for fences interruptibly in blocking mode.\0"
  "Date\0Thu, 22 Jun 2017 09:22:49 +0200\0"
  "To\0Eric Anholt <eric@anholt.net>\0"
- "Cc\0linux-kernel@vger.kernel.org"
- " dri-devel@lists.freedesktop.org\0"
+ "Cc\0dri-devel@lists.freedesktop.org"
+ " linux-kernel@vger.kernel.org\0"
  "\00:1\0"
  "b\0"
  "On Wed, 21 Jun 2017 11:50:00 -0700\n"
@@ -43,11 +43,6 @@
  "> +\n"
  ">  \tfor_each_plane_in_state(state, plane, new_state, i) {\n"
  ">  \t\tif ((plane->state->fb != new_state->fb) && new_state->fb) {\n"
- ">  \t\t\tstruct drm_gem_cma_object *cma_bo =\n"
- "\n"
- "_______________________________________________\n"
- "dri-devel mailing list\n"
- "dri-devel@lists.freedesktop.org\n"
- https://lists.freedesktop.org/mailman/listinfo/dri-devel
+ ">  \t\t\tstruct drm_gem_cma_object *cma_bo ="
 
-53d4b8f449f12ab1bbac9777f9086ea7ed0d7f1b5eb6b3b5c432c9e36d54aacc
+ee2233e10b6938615a736a86616e8d11f1b8b2cfffdbadf053577b15868e3b43
