diff for duplicates of <20170416080227.671834007@linuxfoundation.org>

diff --git a/a/1.txt b/N1/1.txt
index 34a0861..1a4f4a8 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -91,9 +91,3 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  }
  
  static inline void __force_wake_auto(struct drm_i915_private *dev_priv,
-
-
-_______________________________________________
-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 acdd9e6..692baca 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -3,13 +3,16 @@
  "Subject\0[PATCH 4.10 01/29] drm/i915: Fix forcewake active domain tracking\0"
  "Date\0Sun, 16 Apr 2017 10:04:18 +0200\0"
  "To\0linux-kernel@vger.kernel.org\0"
- "Cc\0Jani 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
+  Tvrtko Ursulin <tvrtko.ursulin@intel.com>
   Paneri
   Praveen <praveen.paneri@intel.com>
- " Daniel Vetter <daniel.vetter@intel.com>\0"
+  Chris Wilson <chris@chris-wilson.co.uk>
+  Daniel Vetter <daniel.vetter@intel.com>
+  Jani Nikula <jani.nikula@linux.intel.com>
+  intel-gfx@lists.freedesktop.org
+ " Jani Nikula <jani.nikula@intel.com>\0"
  "\00:1\0"
  "b\0"
  "4.10-stable review patch.  If anyone has any objections, please let me know.\n"
@@ -104,12 +107,6 @@
  "-\tdev_priv->uncore.fw_domains_active |= fw_domains;\n"
  " }\n"
  " \n"
- " static inline void __force_wake_auto(struct drm_i915_private *dev_priv,\n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "Intel-gfx mailing list\n"
- "Intel-gfx@lists.freedesktop.org\n"
- https://lists.freedesktop.org/mailman/listinfo/intel-gfx
+  static inline void __force_wake_auto(struct drm_i915_private *dev_priv,
 
-777d067c7254346dd93c80a9c293ddf1311db5f8c7a42d8f8e2ce993cbbbaa14
+f1844b50dc8a86b3d7ab38299886bf501798fa172c06ed1b461d2484937ae758
