diff for duplicates of <20190213230455.5605-2-ira.weiny@intel.com>

diff --git a/a/1.txt b/N1/1.txt
index ea32141..365cb96 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -105,7 +105,7 @@ index 73652e21efec..1500bd0bb6da 100644
 @@ -351,7 +351,8 @@ static int vaddr_get_pfn(struct mm_struct *mm, unsigned long vaddr,
  
  	down_read(&mm->mmap_sem);
- 	if (mm == current->mm) {
+ 	if (mm = current->mm) {
 -		ret = get_user_pages_longterm(vaddr, 1, flags, page, vmas);
 +		ret = get_user_pages(vaddr, 1, flags | FOLL_LONGTERM, page,
 +				     vmas);
@@ -186,7 +186,7 @@ index b63e88eca31b..ee96eaff118c 100644
 + * filesystem and we need guarantees that longterm users like RDMA and V4L2
 + * only establish mappings that have a kernel enforced revocation mechanism.
   *
-  * "longterm" == userspace controlled elevated page count lifetime.
+  * "longterm" = userspace controlled elevated page count lifetime.
   * Contrast this to iov_iter_get_pages() usages which are transient.
   */
 -long get_user_pages_longterm(unsigned long start, unsigned long nr_pages,
@@ -236,9 +236,9 @@ index b63e88eca31b..ee96eaff118c 100644
 +		for (i = 0; i < rc; i++) {
 +			struct vm_area_struct *vma = vmas_tmp[i];
  
--		if (vma == vma_prev)
+-		if (vma = vma_prev)
 -			continue;
-+			if (vma == vma_prev)
++			if (vma = vma_prev)
 +				continue;
  
 -		vma_prev = vma;
@@ -333,8 +333,3 @@ index 5b42d3d4b60a..c898e2e0d1e4 100644
  			nr = get_user_pages(addr, nr, gup->flags & 1, pages + i,
 -- 
 2.20.1
-
-_______________________________________________
-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 64ccf1d..f17b13f 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,8 +1,8 @@
  "ref\020190211201643.7599-1-ira.weiny@intel.com\0"
  "ref\020190213230455.5605-1-ira.weiny@intel.com\0"
- "From\0ira.weiny--- via dri-devel <dri-devel@lists.freedesktop.org>\0"
+ "From\0ira.weiny@intel.com\0"
  "Subject\0[PATCH V2 1/7] mm/gup: Replace get_user_pages_longterm() with FOLL_LONGTERM\0"
- "Date\0Wed, 13 Feb 2019 15:04:49 -0800\0"
+ "Date\0Wed, 13 Feb 2019 23:04:49 +0000\0"
  "To\0linux-mips@vger.kernel.org"
   linux-kernel@vger.kernel.org
   kvm-ppc@vger.kernel.org
@@ -157,7 +157,7 @@
  "@@ -351,7 +351,8 @@ static int vaddr_get_pfn(struct mm_struct *mm, unsigned long vaddr,\n"
  " \n"
  " \tdown_read(&mm->mmap_sem);\n"
- " \tif (mm == current->mm) {\n"
+ " \tif (mm = current->mm) {\n"
  "-\t\tret = get_user_pages_longterm(vaddr, 1, flags, page, vmas);\n"
  "+\t\tret = get_user_pages(vaddr, 1, flags | FOLL_LONGTERM, page,\n"
  "+\t\t\t\t     vmas);\n"
@@ -238,7 +238,7 @@
  "+ * filesystem and we need guarantees that longterm users like RDMA and V4L2\n"
  "+ * only establish mappings that have a kernel enforced revocation mechanism.\n"
  "  *\n"
- "  * \"longterm\" == userspace controlled elevated page count lifetime.\n"
+ "  * \"longterm\" = userspace controlled elevated page count lifetime.\n"
  "  * Contrast this to iov_iter_get_pages() usages which are transient.\n"
  "  */\n"
  "-long get_user_pages_longterm(unsigned long start, unsigned long nr_pages,\n"
@@ -288,9 +288,9 @@
  "+\t\tfor (i = 0; i < rc; i++) {\n"
  "+\t\t\tstruct vm_area_struct *vma = vmas_tmp[i];\n"
  " \n"
- "-\t\tif (vma == vma_prev)\n"
+ "-\t\tif (vma = vma_prev)\n"
  "-\t\t\tcontinue;\n"
- "+\t\t\tif (vma == vma_prev)\n"
+ "+\t\t\tif (vma = vma_prev)\n"
  "+\t\t\t\tcontinue;\n"
  " \n"
  "-\t\tvma_prev = vma;\n"
@@ -384,11 +384,6 @@
  " \t\tcase GUP_BENCHMARK:\n"
  " \t\t\tnr = get_user_pages(addr, nr, gup->flags & 1, pages + i,\n"
  "-- \n"
- "2.20.1\n"
- "\n"
- "_______________________________________________\n"
- "dri-devel mailing list\n"
- "dri-devel@lists.freedesktop.org\n"
- https://lists.freedesktop.org/mailman/listinfo/dri-devel
+ 2.20.1
 
-63a6b228f98398f945a12823997dad5a2d9f37eaa9f8c78e71b20548cdd72338
+2e20140fc280be43ba9305bba79e6eb101626ec8bd8205f8105239313285371d
