diff for duplicates of <20180313152321.784391855@linuxfoundation.org>

diff --git a/a/1.txt b/N1/1.txt
index be119ce..59e927b 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 9e73fa9..fb6f59f 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -4,10 +4,14 @@
  "Date\0Tue, 13 Mar 2018 16:23:03 +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.15-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:
 
-e8fecce4a5c84de615cd4269c1d423a2c1914e1f34b703129d218f318f92c352
+3eba29f4a40402c70681567cc29a281dcfa761569b7b6fdbaef4551cbcd8ddd3
