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

diff --git a/a/1.txt b/N1/1.txt
index 0d6f559..e18abe3 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -15,7 +15,7 @@ On ma, 2016-04-04 at 14:18 +0100, Chris Wilson wrote:
 > many pages are marked as MOVABLE, as only those pages can be migrated.
 > 
 > Currently the backing pages for GFX buffers are allocated from shmemfs
-> with GFP_RECLAIMABLE flag, in units of 4KB pages.  In the case of limited
+> with GFP_RECLAIMABLE flag, in units of 4KB pages.A A In the case of limited
 > swap space, it may not be possible always to reclaim or swap-out pages of
 > all the inactive objects, to make way for free space allowing formation
 > of higher order groups of physically-contiguous pages on compaction.
@@ -24,23 +24,23 @@ On ma, 2016-04-04 at 14:18 +0100, Chris Wilson wrote:
 > pin the pages if they are in use by GPU, which will prevent their
 > migration. So the migratepage callback in shmem is also hooked up to get
 > a notification when kernel initiates the page migration. On the
-> notification, i915.ko appropriately unpin the pages.  With this we can
+> notification, i915.ko appropriately unpin the pages.A A With this we can
 > effectively mark the GPU pages as MOVABLE and hence mitigate the
 > fragmentation problem.
 > 
 > v2:
->  - Rename the migration routine to gem_shrink_migratepage, move it to the
->    shrinker file, and use the existing constructs (Chris)
->  - To cleanup, add a new helper function to encapsulate all page migration
->    skip conditions (Chris)
->  - Add a new local helper function in shrinker file, for dropping the
->    backing pages, and call the same from gem_shrink() also (Chris)
+> A - Rename the migration routine to gem_shrink_migratepage, move it to the
+> A A A shrinker file, and use the existing constructs (Chris)
+> A - To cleanup, add a new helper function to encapsulate all page migration
+> A A A skip conditions (Chris)
+> A - Add a new local helper function in shrinker file, for dropping the
+> A A A backing pages, and call the same from gem_shrink() also (Chris)
 > 
 > v3:
->  - Fix/invert the check on the return value of unsafe_drop_pages (Chris)
+> A - Fix/invert the check on the return value of unsafe_drop_pages (Chris)
 > 
 > v4:
->  - Minor tidy
+> A - Minor tidy
 > 
 > Testcase: igt/gem_shrink
 > Bugzilla: (e.g.) https://bugs.freedesktop.org/show_bug.cgi?id=90254
@@ -70,7 +70,9 @@ Regards, Joonas
 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 8920504..7ea2bff 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,7 +1,7 @@
  "ref\01459775891-32442-1-git-send-email-chris@chris-wilson.co.uk\0"
  "ref\01459775891-32442-2-git-send-email-chris@chris-wilson.co.uk\0"
  "From\0Joonas Lahtinen <joonas.lahtinen@linux.intel.com>\0"
- "Subject\0Re: [PATCH v4 2/2] drm/i915: Make GPU pages movable\0"
+ "Subject\0Re: [Intel-gfx] [PATCH v4 2/2] drm/i915: Make GPU pages movable\0"
  "Date\0Tue, 18 Oct 2016 15:05:01 +0300\0"
  "To\0Chris Wilson <chris@chris-wilson.co.uk>"
  " intel-gfx@lists.freedesktop.org\0"
@@ -28,7 +28,7 @@
  "> many pages are marked as MOVABLE, as only those pages can be migrated.\n"
  "> \n"
  "> Currently the backing pages for GFX buffers are allocated from shmemfs\n"
- "> with GFP_RECLAIMABLE flag, in units of 4KB pages.\302\240\302\240In the case of limited\n"
+ "> with GFP_RECLAIMABLE flag, in units of 4KB pages.A A In the case of limited\n"
  "> swap space, it may not be possible always to reclaim or swap-out pages of\n"
  "> all the inactive objects, to make way for free space allowing formation\n"
  "> of higher order groups of physically-contiguous pages on compaction.\n"
@@ -37,23 +37,23 @@
  "> pin the pages if they are in use by GPU, which will prevent their\n"
  "> migration. So the migratepage callback in shmem is also hooked up to get\n"
  "> a notification when kernel initiates the page migration. On the\n"
- "> notification, i915.ko appropriately unpin the pages.\302\240\302\240With this we can\n"
+ "> notification, i915.ko appropriately unpin the pages.A A With this we can\n"
  "> effectively mark the GPU pages as MOVABLE and hence mitigate the\n"
  "> fragmentation problem.\n"
  "> \n"
  "> v2:\n"
- "> \302\240- Rename the migration routine to gem_shrink_migratepage, move it to the\n"
- "> \302\240\302\240\302\240shrinker file, and use the existing constructs (Chris)\n"
- "> \302\240- To cleanup, add a new helper function to encapsulate all page migration\n"
- "> \302\240\302\240\302\240skip conditions (Chris)\n"
- "> \302\240- Add a new local helper function in shrinker file, for dropping the\n"
- "> \302\240\302\240\302\240backing pages, and call the same from gem_shrink() also (Chris)\n"
+ "> A - Rename the migration routine to gem_shrink_migratepage, move it to the\n"
+ "> A A A shrinker file, and use the existing constructs (Chris)\n"
+ "> A - To cleanup, add a new helper function to encapsulate all page migration\n"
+ "> A A A skip conditions (Chris)\n"
+ "> A - Add a new local helper function in shrinker file, for dropping the\n"
+ "> A A A backing pages, and call the same from gem_shrink() also (Chris)\n"
  "> \n"
  "> v3:\n"
- "> \302\240- Fix/invert the check on the return value of unsafe_drop_pages (Chris)\n"
+ "> A - Fix/invert the check on the return value of unsafe_drop_pages (Chris)\n"
  "> \n"
  "> v4:\n"
- "> \302\240- Minor tidy\n"
+ "> A - Minor tidy\n"
  "> \n"
  "> Testcase: igt/gem_shrink\n"
  "> Bugzilla: (e.g.) https://bugs.freedesktop.org/show_bug.cgi?id=90254\n"
@@ -83,9 +83,11 @@
  "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>"
 
-8e23f183a99175af24eb449fa7a1d3a7697ffc748d5273e5aa76708fc1e9a5d9
+bcb09910d266c5045c00a06ac21c00357fb706ba8ad62566b86e3f10f37d5755
