diff for duplicates of <1459844378.5564.12.camel@linux.intel.com>

diff --git a/a/1.txt b/N1/1.txt
index 1720fb5..44fdc41 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -20,38 +20,38 @@ Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
 > Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
 > Cc: Mika Kahola <mika.kahola@intel.com>
 > ---
->  drivers/gpu/drm/i915/i915_drv.h          |  1 +
->  drivers/gpu/drm/i915/i915_gem_shrinker.c | 39 ++++++++++++++++++++++++++++++++
->  2 files changed, 40 insertions(+)
+> A drivers/gpu/drm/i915/i915_drv.hA A A A A A A A A A |A A 1 +
+> A drivers/gpu/drm/i915/i915_gem_shrinker.c | 39 ++++++++++++++++++++++++++++++++
+> A 2 files changed, 40 insertions(+)
 > 
 > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
 > index dd187727c813..6443745d4182 100644
 > --- a/drivers/gpu/drm/i915/i915_drv.h
 > +++ b/drivers/gpu/drm/i915/i915_drv.h
 > @@ -1257,6 +1257,7 @@ struct i915_gem_mm {
->  	struct i915_hw_ppgtt *aliasing_ppgtt;
->  
->  	struct notifier_block oom_notifier;
+> A 	struct i915_hw_ppgtt *aliasing_ppgtt;
+> A 
+> A 	struct notifier_block oom_notifier;
 > +	struct notifier_block vmap_notifier;
->  	struct shrinker shrinker;
->  	bool shrinker_no_lock_stealing;
->  
+> A 	struct shrinker shrinker;
+> A 	bool shrinker_no_lock_stealing;
+> A 
 > diff --git a/drivers/gpu/drm/i915/i915_gem_shrinker.c b/drivers/gpu/drm/i915/i915_gem_shrinker.c
 > index e391ee3ec486..be7501afb59e 100644
 > --- a/drivers/gpu/drm/i915/i915_gem_shrinker.c
 > +++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c
 > @@ -28,6 +28,7 @@
->  #include 
->  #include 
->  #include 
+> A #include 
+> A #include 
+> A #include 
 > +#include 
->  #include 
->  #include 
->  
+> A #include 
+> A #include 
+> A 
 > @@ -356,6 +357,40 @@ i915_gem_shrinker_oom(struct notifier_block *nb, unsigned long event, void *ptr)
->  	return NOTIFY_DONE;
->  }
->  
+> A 	return NOTIFY_DONE;
+> A }
+> A 
 > +static int
 > +i915_gem_shrinker_vmap(struct notifier_block *nb, unsigned long event, void *ptr)
 > +{
@@ -95,32 +95,34 @@ Regards, Joonas
 > +	return NOTIFY_DONE;
 > +}
 > +
->  /**
->   * i915_gem_shrinker_init - Initialize i915 shrinker
->   * @dev_priv: i915 device
+> A /**
+> A  * i915_gem_shrinker_init - Initialize i915 shrinker
+> A  * @dev_priv: i915 device
 > @@ -371,6 +406,9 @@ void i915_gem_shrinker_init(struct drm_i915_private *dev_priv)
->  
->  	dev_priv->mm.oom_notifier.notifier_call = i915_gem_shrinker_oom;
->  	WARN_ON(register_oom_notifier(&dev_priv->mm.oom_notifier));
+> A 
+> A 	dev_priv->mm.oom_notifier.notifier_call = i915_gem_shrinker_oom;
+> A 	WARN_ON(register_oom_notifier(&dev_priv->mm.oom_notifier));
 > +
 > +	dev_priv->mm.vmap_notifier.notifier_call = i915_gem_shrinker_vmap;
 > +	WARN_ON(register_vmap_purge_notifier(&dev_priv->mm.vmap_notifier));
->  }
->  
->  /**
+> A }
+> A 
+> A /**
 > @@ -381,6 +419,7 @@ void i915_gem_shrinker_init(struct drm_i915_private *dev_priv)
->   */
->  void i915_gem_shrinker_cleanup(struct drm_i915_private *dev_priv)
->  {
+> A  */
+> A void i915_gem_shrinker_cleanup(struct drm_i915_private *dev_priv)
+> A {
 > +	WARN_ON(unregister_vmap_purge_notifier(&dev_priv->mm.vmap_notifier));
->  	WARN_ON(unregister_oom_notifier(&dev_priv->mm.oom_notifier));
->  	unregister_shrinker(&dev_priv->mm.shrinker);
->  }
+> A 	WARN_ON(unregister_oom_notifier(&dev_priv->mm.oom_notifier));
+> A 	unregister_shrinker(&dev_priv->mm.shrinker);
+> A }
 -- 
 Joonas Lahtinen
 Open Source Technology Center
 Intel Corporation
-_______________________________________________
-Intel-gfx mailing list
-Intel-gfx@lists.freedesktop.org
-https://lists.freedesktop.org/mailman/listinfo/intel-gfx
+
+--
+To unsubscribe, send a message with 'unsubscribe linux-mm' in
+the body to majordomo@kvack.org.  For more info on Linux MM,
+see: http://www.linux-mm.org/ .
+Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
diff --git a/a/content_digest b/N1/content_digest
index fd3a901..742f07f 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -5,12 +5,14 @@
  "Date\0Tue, 05 Apr 2016 11:19:38 +0300\0"
  "To\0Chris Wilson <chris@chris-wilson.co.uk>"
  " intel-gfx@lists.freedesktop.org\0"
- "Cc\0linux-kernel@vger.kernel.org"
+ "Cc\0Andrew Morton <akpm@linux-foundation.org>"
+  David Rientjes <rientjes@google.com>
   Roman Pen <r.peniaev@gmail.com>
+  Mel Gorman <mgorman@techsingularity.net>
   linux-mm@kvack.org
-  David Rientjes <rientjes@google.com>
-  Andrew Morton <akpm@linux-foundation.org>
- " Mel Gorman <mgorman@techsingularity.net>\0"
+  linux-kernel@vger.kernel.org
+  Tvrtko Ursulin <tvrtko.ursulin@intel.com>
+ " Mika Kahola <mika.kahola@intel.com>\0"
  "\00:1\0"
  "b\0"
  "On ma, 2016-04-04 at 14:46 +0100, Chris Wilson wrote:\n"
@@ -35,38 +37,38 @@
  "> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>\n"
  "> Cc: Mika Kahola <mika.kahola@intel.com>\n"
  "> ---\n"
- "> \302\240drivers/gpu/drm/i915/i915_drv.h\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240\302\240|\302\240\302\2401 +\n"
- "> \302\240drivers/gpu/drm/i915/i915_gem_shrinker.c | 39 ++++++++++++++++++++++++++++++++\n"
- "> \302\2402 files changed, 40 insertions(+)\n"
+ "> A drivers/gpu/drm/i915/i915_drv.hA A A A A A A A A A |A A 1 +\n"
+ "> A drivers/gpu/drm/i915/i915_gem_shrinker.c | 39 ++++++++++++++++++++++++++++++++\n"
+ "> A 2 files changed, 40 insertions(+)\n"
  "> \n"
  "> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h\n"
  "> index dd187727c813..6443745d4182 100644\n"
  "> --- a/drivers/gpu/drm/i915/i915_drv.h\n"
  "> +++ b/drivers/gpu/drm/i915/i915_drv.h\n"
  "> @@ -1257,6 +1257,7 @@ struct i915_gem_mm {\n"
- "> \302\240\tstruct i915_hw_ppgtt *aliasing_ppgtt;\n"
- "> \302\240\n"
- "> \302\240\tstruct notifier_block oom_notifier;\n"
+ "> A \tstruct i915_hw_ppgtt *aliasing_ppgtt;\n"
+ "> A \n"
+ "> A \tstruct notifier_block oom_notifier;\n"
  "> +\tstruct notifier_block vmap_notifier;\n"
- "> \302\240\tstruct shrinker shrinker;\n"
- "> \302\240\tbool shrinker_no_lock_stealing;\n"
- "> \302\240\n"
+ "> A \tstruct shrinker shrinker;\n"
+ "> A \tbool shrinker_no_lock_stealing;\n"
+ "> A \n"
  "> diff --git a/drivers/gpu/drm/i915/i915_gem_shrinker.c b/drivers/gpu/drm/i915/i915_gem_shrinker.c\n"
  "> index e391ee3ec486..be7501afb59e 100644\n"
  "> --- a/drivers/gpu/drm/i915/i915_gem_shrinker.c\n"
  "> +++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c\n"
  "> @@ -28,6 +28,7 @@\n"
- "> \302\240#include \n"
- "> \302\240#include \n"
- "> \302\240#include \n"
+ "> A #include \n"
+ "> A #include \n"
+ "> A #include \n"
  "> +#include \n"
- "> \302\240#include \n"
- "> \302\240#include \n"
- "> \302\240\n"
+ "> A #include \n"
+ "> A #include \n"
+ "> A \n"
  "> @@ -356,6 +357,40 @@ i915_gem_shrinker_oom(struct notifier_block *nb, unsigned long event, void *ptr)\n"
- "> \302\240\treturn NOTIFY_DONE;\n"
- "> \302\240}\n"
- "> \302\240\n"
+ "> A \treturn NOTIFY_DONE;\n"
+ "> A }\n"
+ "> A \n"
  "> +static int\n"
  "> +i915_gem_shrinker_vmap(struct notifier_block *nb, unsigned long event, void *ptr)\n"
  "> +{\n"
@@ -110,34 +112,36 @@
  "> +\treturn NOTIFY_DONE;\n"
  "> +}\n"
  "> +\n"
- "> \302\240/**\n"
- "> \302\240 * i915_gem_shrinker_init - Initialize i915 shrinker\n"
- "> \302\240 * @dev_priv: i915 device\n"
+ "> A /**\n"
+ "> A  * i915_gem_shrinker_init - Initialize i915 shrinker\n"
+ "> A  * @dev_priv: i915 device\n"
  "> @@ -371,6 +406,9 @@ void i915_gem_shrinker_init(struct drm_i915_private *dev_priv)\n"
- "> \302\240\n"
- "> \302\240\tdev_priv->mm.oom_notifier.notifier_call = i915_gem_shrinker_oom;\n"
- "> \302\240\tWARN_ON(register_oom_notifier(&dev_priv->mm.oom_notifier));\n"
+ "> A \n"
+ "> A \tdev_priv->mm.oom_notifier.notifier_call = i915_gem_shrinker_oom;\n"
+ "> A \tWARN_ON(register_oom_notifier(&dev_priv->mm.oom_notifier));\n"
  "> +\n"
  "> +\tdev_priv->mm.vmap_notifier.notifier_call = i915_gem_shrinker_vmap;\n"
  "> +\tWARN_ON(register_vmap_purge_notifier(&dev_priv->mm.vmap_notifier));\n"
- "> \302\240}\n"
- "> \302\240\n"
- "> \302\240/**\n"
+ "> A }\n"
+ "> A \n"
+ "> A /**\n"
  "> @@ -381,6 +419,7 @@ void i915_gem_shrinker_init(struct drm_i915_private *dev_priv)\n"
- "> \302\240 */\n"
- "> \302\240void i915_gem_shrinker_cleanup(struct drm_i915_private *dev_priv)\n"
- "> \302\240{\n"
+ "> A  */\n"
+ "> A void i915_gem_shrinker_cleanup(struct drm_i915_private *dev_priv)\n"
+ "> A {\n"
  "> +\tWARN_ON(unregister_vmap_purge_notifier(&dev_priv->mm.vmap_notifier));\n"
- "> \302\240\tWARN_ON(unregister_oom_notifier(&dev_priv->mm.oom_notifier));\n"
- "> \302\240\tunregister_shrinker(&dev_priv->mm.shrinker);\n"
- "> \302\240}\n"
+ "> A \tWARN_ON(unregister_oom_notifier(&dev_priv->mm.oom_notifier));\n"
+ "> A \tunregister_shrinker(&dev_priv->mm.shrinker);\n"
+ "> A }\n"
  "-- \n"
  "Joonas Lahtinen\n"
  "Open Source Technology Center\n"
  "Intel Corporation\n"
- "_______________________________________________\n"
- "Intel-gfx mailing list\n"
- "Intel-gfx@lists.freedesktop.org\n"
- https://lists.freedesktop.org/mailman/listinfo/intel-gfx
+ "\n"
+ "--\n"
+ "To unsubscribe, send a message with 'unsubscribe linux-mm' in\n"
+ "the body to majordomo@kvack.org.  For more info on Linux MM,\n"
+ "see: http://www.linux-mm.org/ .\n"
+ "Don't email: <a href=mailto:\"dont@kvack.org\"> email@kvack.org </a>"
 
-dea7956cc190cba0b1eff3f69b26455dc506ce630a1eb9271c9c9a341f55000b
+12831d4236f7a71e3a8e9d3e0dc7d0b9f64a075986f4af1b8b89f4fd64d97282
