diff for duplicates of <20170615175426.707438318@linuxfoundation.org>

diff --git a/a/1.txt b/N1/1.txt
index 76b8b2e..a7ad4ea 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -39,9 +39,3 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	.has_aliasing_ppgtt = 1, \
  	.has_full_ppgtt = 1, \
  	.has_full_48bit_ppgtt = 1, \
-
-
-_______________________________________________
-Intel-gfx mailing list
-Intel-gfx@lists.freedesktop.org
-https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/a/content_digest b/N1/content_digest
index 4156d43..b65d3cf 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -3,13 +3,16 @@
  "Subject\0[PATCH 4.11 13/13] drm/i915: Disable decoupled MMIO\0"
  "Date\0Thu, 15 Jun 2017 19:54:47 +0200\0"
  "To\0linux-kernel@vger.kernel.org\0"
- "Cc\0Zhe Wang <zhe1.wang@intel.com>"
-  Jani Nikula <jani.nikula@intel.com>
-  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-  intel-gfx@lists.freedesktop.org
+ "Cc\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
   stable@vger.kernel.org
+  Zhe Wang <zhe1.wang@intel.com>
   Praveen Paneri <praveen.paneri@intel.com>
- " Daniel Vetter <daniel.vetter@intel.com>\0"
+  Tvrtko Ursulin <tvrtko.ursulin@intel.com>
+  Daniel Vetter <daniel.vetter@intel.com>
+  Jani Nikula <jani.nikula@linux.intel.com>
+  intel-gfx@lists.freedesktop.org
+  Kai Chen <kai.chen@intel.com>
+ " Jani Nikula <jani.nikula@intel.com>\0"
  "\00:1\0"
  "b\0"
  "4.11-stable review patch.  If anyone has any objections, please let me know.\n"
@@ -52,12 +55,6 @@
  "-\t.has_decoupled_mmio = 1, \\\n"
  " \t.has_aliasing_ppgtt = 1, \\\n"
  " \t.has_full_ppgtt = 1, \\\n"
- " \t.has_full_48bit_ppgtt = 1, \\\n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "Intel-gfx mailing list\n"
- "Intel-gfx@lists.freedesktop.org\n"
- https://lists.freedesktop.org/mailman/listinfo/intel-gfx
+ " \t.has_full_48bit_ppgtt = 1, \\"
 
-cb40465e5d2b12c0beef496d7d5ddbddbf4427084a88c672a84093130844ff9f
+23c5d71ec739aecc13c49465f9fe8d336858769c71ad2c041d1ce90cdca73e27
