diff for duplicates of <20180313152502.103047885@linuxfoundation.org>

diff --git a/a/1.txt b/N1/1.txt
index 8a0f01b..427023b 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -141,9 +141,3 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	free_oa_buffer(dev_priv);
  
  err_oa_buf_alloc:
-
-
-_______________________________________________
-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 abad6f7..369ae0f 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -4,10 +4,14 @@
  "Date\0Tue, 13 Mar 2018 16:24:20 +0100\0"
  "To\0linux-kernel@vger.kernel.org\0"
  "Cc\0Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
-  intel-gfx@lists.freedesktop.org
-  Rodrigo Vivi <rodrigo.vivi@intel.com>
   stable@vger.kernel.org
- " Matthew Auld <matthew.auld@intel.com>\0"
+  Lionel Landwerlin <lionel.g.landwerlin@intel.com>
+  Matthew Auld <matthew.auld@intel.com>
+  Chris Wilson <chris@chris-wilson.co.uk>
+  Jani Nikula <jani.nikula@linux.intel.com>
+  Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
+  Rodrigo Vivi <rodrigo.vivi@intel.com>
+ " intel-gfx@lists.freedesktop.org\0"
  "\00:1\0"
  "b\0"
  "4.14-stable review patch.  If anyone has any objections, please let me know.\n"
@@ -152,12 +156,6 @@
  "+err_lock:\n"
  " \tfree_oa_buffer(dev_priv);\n"
  " \n"
- " err_oa_buf_alloc:\n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "Intel-gfx mailing list\n"
- "Intel-gfx@lists.freedesktop.org\n"
- https://lists.freedesktop.org/mailman/listinfo/intel-gfx
+  err_oa_buf_alloc:
 
-0c150bd0bba5ee67c3b87036a602d165d49836b4dd2a88e3dbdeec8d8b92fec9
+d7374e9de2b425f9da1cf4024c41d2dc7f8ed57909d214fc664dbff665e27e60
