diff for duplicates of <20180313152321.396639946@linuxfoundation.org>

diff --git a/a/1.txt b/N1/1.txt
index c066ce4..f191b38 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -47,9 +47,3 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  		encoder = dev_priv->av_enc_map[pipe];
  		/*
  		 * when bootup, audio driver may not know it is
-
-
-_______________________________________________
-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 a25573b..fcc0cdc 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -3,12 +3,15 @@
  "Subject\0[PATCH 4.15 010/146] drm/i915/audio: fix check for av_enc_map overflow\0"
  "Date\0Tue, 13 Mar 2018 16:22:57 +0100\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
+  Mika Kahola <mika.kahola@intel.com>
   Rodrigo Vivi <rodrigo.vivi@intel.com>
- " Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>\0"
+  Jani Nikula <jani.nikula@linux.intel.com>
+  Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
+  intel-gfx@lists.freedesktop.org
+  Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
+ " Jani Nikula <jani.nikula@intel.com>\0"
  "\00:1\0"
  "b\0"
  "4.15-stable review patch.  If anyone has any objections, please let me know.\n"
@@ -59,12 +62,6 @@
  "+\n"
  " \t\tencoder = dev_priv->av_enc_map[pipe];\n"
  " \t\t/*\n"
- " \t\t * when bootup, audio driver may not know it is\n"
- "\n"
- "\n"
- "_______________________________________________\n"
- "Intel-gfx mailing list\n"
- "Intel-gfx@lists.freedesktop.org\n"
- https://lists.freedesktop.org/mailman/listinfo/intel-gfx
+ " \t\t * when bootup, audio driver may not know it is"
 
-51e50e9a50e503e0a9ef04a580af29237e6bef4ecb56cd3eac8aaf751c5cbf11
+728ea70bbafd9e708cde2c8b24f3eb300edf62fc21a126100066d86dd93903d0
