diff for duplicates of <20151210131924.GP4437@intel.com>

diff --git a/a/1.txt b/N1/1.txt
index 2305484..222b9b9 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,7 +1,7 @@
 On Thu, Dec 10, 2015 at 01:39:47PM +0200, Jani Nikula wrote:
 > On Thu, 10 Dec 2015, Daniel Vetter <daniel@ffwll.ch> wrote:
 > > On Mon, Dec 07, 2015 at 11:13:20PM +0200, ville.syrjala@linux.intel.com wrote:
-> >> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
+> >> From: Ville Syrjï¿½lï¿½ <ville.syrjala@linux.intel.com>
 > >> 
 > >> Atomic changes broke check_digital_port_conflicts(). It needs to look
 > >> at the global situation instead of just trying to find a conflict
@@ -39,7 +39,7 @@ format-patched it. Sorry about that, will resend.
 > >
 > >> Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
 > >> Fixes: 5448a00d3f06 ("drm/i915: Don't use staged config in check_digital_port_conflicts()")
-> >> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
+> >> Signed-off-by: Ville Syrjï¿½lï¿½ <ville.syrjala@linux.intel.com>
 > >> ---
 > >>  drivers/gpu/drm/i915/intel_display.c | 13 +++++++++----
 > >>  1 file changed, 9 insertions(+), 4 deletions(-)
@@ -88,9 +88,5 @@ format-patched it. Sorry about that, will resend.
 > Jani Nikula, Intel Open Source Technology Center
 
 -- 
-Ville Syrjälä
+Ville Syrjï¿½lï¿½
 Intel OTC
-_______________________________________________
-Intel-gfx mailing list
-Intel-gfx@lists.freedesktop.org
-http://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/a/content_digest b/N1/content_digest
index 39d10ae..0ce3ee9 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -2,10 +2,11 @@
  "ref\020151210095247.GN20822@phenom.ffwll.local\0"
  "ref\0877fkmlegs.fsf@intel.com\0"
  "From\0Ville Syrj\303\244l\303\244 <ville.syrjala@linux.intel.com>\0"
- "Subject\0Re: [PATCH] drm/i915: Unbreak check_digital_port_conflicts()\0"
+ "Subject\0Re: [Intel-gfx] [PATCH] drm/i915: Unbreak check_digital_port_conflicts()\0"
  "Date\0Thu, 10 Dec 2015 15:19:24 +0200\0"
  "To\0Jani Nikula <jani.nikula@linux.intel.com>\0"
- "Cc\0Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>"
+ "Cc\0Daniel Vetter <daniel@ffwll.ch>"
+  Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>
   intel-gfx@lists.freedesktop.org
  " stable@vger.kernel.org\0"
  "\00:1\0"
@@ -13,7 +14,7 @@
  "On Thu, Dec 10, 2015 at 01:39:47PM +0200, Jani Nikula wrote:\n"
  "> On Thu, 10 Dec 2015, Daniel Vetter <daniel@ffwll.ch> wrote:\n"
  "> > On Mon, Dec 07, 2015 at 11:13:20PM +0200, ville.syrjala@linux.intel.com wrote:\n"
- "> >> From: Ville Syrj\303\244l\303\244 <ville.syrjala@linux.intel.com>\n"
+ "> >> From: Ville Syrj\303\257\302\277\302\275l\303\257\302\277\302\275 <ville.syrjala@linux.intel.com>\n"
  "> >> \n"
  "> >> Atomic changes broke check_digital_port_conflicts(). It needs to look\n"
  "> >> at the global situation instead of just trying to find a conflict\n"
@@ -51,7 +52,7 @@
  "> >\n"
  "> >> Cc: Ander Conselvan de Oliveira <ander.conselvan.de.oliveira@intel.com>\n"
  "> >> Fixes: 5448a00d3f06 (\"drm/i915: Don't use staged config in check_digital_port_conflicts()\")\n"
- "> >> Signed-off-by: Ville Syrj\303\244l\303\244 <ville.syrjala@linux.intel.com>\n"
+ "> >> Signed-off-by: Ville Syrj\303\257\302\277\302\275l\303\257\302\277\302\275 <ville.syrjala@linux.intel.com>\n"
  "> >> ---\n"
  "> >>  drivers/gpu/drm/i915/intel_display.c | 13 +++++++++----\n"
  "> >>  1 file changed, 9 insertions(+), 4 deletions(-)\n"
@@ -100,11 +101,7 @@
  "> Jani Nikula, Intel Open Source Technology Center\n"
  "\n"
  "-- \n"
- "Ville Syrj\303\244l\303\244\n"
- "Intel OTC\n"
- "_______________________________________________\n"
- "Intel-gfx mailing list\n"
- "Intel-gfx@lists.freedesktop.org\n"
- http://lists.freedesktop.org/mailman/listinfo/intel-gfx
+ "Ville Syrj\303\257\302\277\302\275l\303\257\302\277\302\275\n"
+ Intel OTC
 
-116239a2511fa2024d5c533a7d8130e827db4ce159f5a09dd0b0f09082e7c750
+485fc2afbcabda107d671878aece7717ea474c42982581b656016d6b1be56a34
