diff for duplicates of <20180430205145.GC133494@google.com>

diff --git a/a/1.txt b/N1/1.txt
index ece49cb..7ab7668 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -62,7 +62,3 @@ evaluate the expression unless CONFIG_DRM_I915_DEBUG_GEM is set.
 
 Instead of disabling the warning it would probably be better to mark
 has_doorbell as __maybe_unused.
-_______________________________________________
-dri-devel mailing list
-dri-devel@lists.freedesktop.org
-https://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/a/content_digest b/N1/content_digest
index 9141ab7..4751429 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,12 +5,14 @@
  "Subject\0Re: [Intel-gfx] [PATCH v2] drm/i915: Disable some extra clang warnings\0"
  "Date\0Mon, 30 Apr 2018 13:51:45 -0700\0"
  "To\0Chris Wilson <chris@chris-wilson.co.uk>\0"
- "Cc\0David Airlie <airlied@linux.ie>"
+ "Cc\0Jani Nikula <jani.nikula@linux.intel.com>"
+  Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
+  Rodrigo Vivi <rodrigo.vivi@intel.com>
+  David Airlie <airlied@linux.ie>
+  Guenter Roeck <groeck@chromium.org>
   intel-gfx@lists.freedesktop.org
   linux-kernel@vger.kernel.org
-  dri-devel@lists.freedesktop.org
-  Rodrigo Vivi <rodrigo.vivi@intel.com>
- " Guenter Roeck <groeck@chromium.org>\0"
+ " dri-devel@lists.freedesktop.org\0"
  "\00:1\0"
  "b\0"
  "On Mon, Apr 30, 2018 at 09:01:49PM +0100, Chris Wilson wrote:\n"
@@ -76,10 +78,6 @@
  "evaluate the expression unless CONFIG_DRM_I915_DEBUG_GEM is set.\n"
  "\n"
  "Instead of disabling the warning it would probably be better to mark\n"
- "has_doorbell as __maybe_unused.\n"
- "_______________________________________________\n"
- "dri-devel mailing list\n"
- "dri-devel@lists.freedesktop.org\n"
- https://lists.freedesktop.org/mailman/listinfo/dri-devel
+ has_doorbell as __maybe_unused.
 
-354efc5e22895b0062d86f4892bca26a902b7515f62e7bfea32f35253415121d
+871b35b4ca79f35192f0b1d52769519a0706ca32dd5d49632459a9c6cb7b3fa8
