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

diff --git a/a/1.txt b/N1/1.txt
index 08d4d1f..bfc7fc6 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -191,7 +191,7 @@ index 2809d11c7a28..0a6faf3d9960 100644
 -	nr = __get_user_pages_fast(start, nr_pages, write, pages);
 +	nr = __get_user_pages_fast(start, nr_pages, gup_flags & FOLL_WRITE,
 +				   pages);
- 	if (nr == nr_pages)
+ 	if (nr = nr_pages)
  		return nr;
  
  	/* Try to get the remaining pages with get_user_pages */
@@ -324,12 +324,12 @@ index 345bda4494e1..0c8b09602910 100644
 --- a/drivers/gpu/drm/via/via_dmablit.c
 +++ b/drivers/gpu/drm/via/via_dmablit.c
 @@ -239,7 +239,8 @@ via_lock_all_dma_pages(drm_via_sg_info_t *vsg,  drm_via_dmablit_t *xfer)
- 	if (NULL == vsg->pages)
+ 	if (NULL = vsg->pages)
  		return -ENOMEM;
  	ret = get_user_pages_fast((unsigned long)xfer->mem_addr,
--			vsg->num_pages, vsg->direction == DMA_FROM_DEVICE,
+-			vsg->num_pages, vsg->direction = DMA_FROM_DEVICE,
 +			vsg->num_pages,
-+			vsg->direction == DMA_FROM_DEVICE ? FOLL_WRITE : 0,
++			vsg->direction = DMA_FROM_DEVICE ? FOLL_WRITE : 0,
  			vsg->pages);
  	if (ret != vsg->num_pages) {
  		if (ret < 0)
@@ -419,9 +419,9 @@ index cbe467ff1aba..f681b3e9e970 100644
  
  		pinned = get_user_pages_fast(
  				(unsigned long)xfer->loc_addr & PAGE_MASK,
--				nr_pages, dir == DMA_FROM_DEVICE, page_list);
+-				nr_pages, dir = DMA_FROM_DEVICE, page_list);
 +				nr_pages,
-+				dir == DMA_FROM_DEVICE ? FOLL_WRITE : 0,
++				dir = DMA_FROM_DEVICE ? FOLL_WRITE : 0,
 +				page_list);
  
  		if (pinned != nr_pages) {
@@ -436,7 +436,7 @@ index 6516bc3cb58b..790aa148670d 100644
  
 -	ret = get_user_pages_fast((unsigned long)va, 1, 1, p);
 +	ret = get_user_pages_fast((unsigned long)va, 1, FOLL_WRITE, p);
- 	if (ret == 1) {
+ 	if (ret = 1) {
  		dax_dbg("locked page %p, for VA %p", *p, va);
  		return 0;
 diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
@@ -446,9 +446,9 @@ index 7ff22d3f03e3..871b25914c07 100644
 @@ -4918,7 +4918,8 @@ static int sgl_map_user_pages(struct st_buffer *STbp,
  
          /* Try to fault in all of the necessary pages */
-         /* rw==READ means read from drive, write into memory area */
--	res = get_user_pages_fast(uaddr, nr_pages, rw == READ, pages);
-+	res = get_user_pages_fast(uaddr, nr_pages, rw == READ ? FOLL_WRITE : 0,
+         /* rw=READ means read from drive, write into memory area */
+-	res = get_user_pages_fast(uaddr, nr_pages, rw = READ, pages);
++	res = get_user_pages_fast(uaddr, nr_pages, rw = READ ? FOLL_WRITE : 0,
 +				  pages);
  
  	/* Errors and no page mapped should return here */
@@ -602,7 +602,7 @@ index be4bd627caf0..6dbae0692719 100644
 +				pages);
  		if (unlikely(res < 0))
  			return res;
- 		return (res == n ? len : res * PAGE_SIZE) - *start;
+ 		return (res = n ? len : res * PAGE_SIZE) - *start;
 @@ -1361,7 +1363,8 @@ ssize_t iov_iter_get_pages_alloc(struct iov_iter *i,
  		p = get_pages_array(n);
  		if (!p)
@@ -694,7 +694,7 @@ index d3736f5bffec..74cafc0142ea 100644
 +		    num_pages - got, write_page ? FOLL_WRITE : 0, pages + got);
  		if (rc < 0)
  			break;
- 		BUG_ON(rc == 0);
+ 		BUG_ON(rc = 0);
 diff --git a/net/rds/info.c b/net/rds/info.c
 index e367a97a18c8..03f6fd56d237 100644
 --- a/net/rds/info.c
@@ -724,8 +724,3 @@ index 182ab8430594..b340ed4fc43a 100644
  		while (ret--)
 -- 
 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 026a96d..2e391ce 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 3/7] mm/gup: Change GUP fast to use flags rather than a write 'bool'\0"
- "Date\0Wed, 13 Feb 2019 15:04:51 -0800\0"
+ "Date\0Wed, 13 Feb 2019 23:04:51 +0000\0"
  "To\0linux-mips@vger.kernel.org"
   linux-kernel@vger.kernel.org
   kvm-ppc@vger.kernel.org
@@ -243,7 +243,7 @@
  "-\tnr = __get_user_pages_fast(start, nr_pages, write, pages);\n"
  "+\tnr = __get_user_pages_fast(start, nr_pages, gup_flags & FOLL_WRITE,\n"
  "+\t\t\t\t   pages);\n"
- " \tif (nr == nr_pages)\n"
+ " \tif (nr = nr_pages)\n"
  " \t\treturn nr;\n"
  " \n"
  " \t/* Try to get the remaining pages with get_user_pages */\n"
@@ -376,12 +376,12 @@
  "--- a/drivers/gpu/drm/via/via_dmablit.c\n"
  "+++ b/drivers/gpu/drm/via/via_dmablit.c\n"
  "@@ -239,7 +239,8 @@ via_lock_all_dma_pages(drm_via_sg_info_t *vsg,  drm_via_dmablit_t *xfer)\n"
- " \tif (NULL == vsg->pages)\n"
+ " \tif (NULL = vsg->pages)\n"
  " \t\treturn -ENOMEM;\n"
  " \tret = get_user_pages_fast((unsigned long)xfer->mem_addr,\n"
- "-\t\t\tvsg->num_pages, vsg->direction == DMA_FROM_DEVICE,\n"
+ "-\t\t\tvsg->num_pages, vsg->direction = DMA_FROM_DEVICE,\n"
  "+\t\t\tvsg->num_pages,\n"
- "+\t\t\tvsg->direction == DMA_FROM_DEVICE ? FOLL_WRITE : 0,\n"
+ "+\t\t\tvsg->direction = DMA_FROM_DEVICE ? FOLL_WRITE : 0,\n"
  " \t\t\tvsg->pages);\n"
  " \tif (ret != vsg->num_pages) {\n"
  " \t\tif (ret < 0)\n"
@@ -471,9 +471,9 @@
  " \n"
  " \t\tpinned = get_user_pages_fast(\n"
  " \t\t\t\t(unsigned long)xfer->loc_addr & PAGE_MASK,\n"
- "-\t\t\t\tnr_pages, dir == DMA_FROM_DEVICE, page_list);\n"
+ "-\t\t\t\tnr_pages, dir = DMA_FROM_DEVICE, page_list);\n"
  "+\t\t\t\tnr_pages,\n"
- "+\t\t\t\tdir == DMA_FROM_DEVICE ? FOLL_WRITE : 0,\n"
+ "+\t\t\t\tdir = DMA_FROM_DEVICE ? FOLL_WRITE : 0,\n"
  "+\t\t\t\tpage_list);\n"
  " \n"
  " \t\tif (pinned != nr_pages) {\n"
@@ -488,7 +488,7 @@
  " \n"
  "-\tret = get_user_pages_fast((unsigned long)va, 1, 1, p);\n"
  "+\tret = get_user_pages_fast((unsigned long)va, 1, FOLL_WRITE, p);\n"
- " \tif (ret == 1) {\n"
+ " \tif (ret = 1) {\n"
  " \t\tdax_dbg(\"locked page %p, for VA %p\", *p, va);\n"
  " \t\treturn 0;\n"
  "diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c\n"
@@ -498,9 +498,9 @@
  "@@ -4918,7 +4918,8 @@ static int sgl_map_user_pages(struct st_buffer *STbp,\n"
  " \n"
  "         /* Try to fault in all of the necessary pages */\n"
- "         /* rw==READ means read from drive, write into memory area */\n"
- "-\tres = get_user_pages_fast(uaddr, nr_pages, rw == READ, pages);\n"
- "+\tres = get_user_pages_fast(uaddr, nr_pages, rw == READ ? FOLL_WRITE : 0,\n"
+ "         /* rw=READ means read from drive, write into memory area */\n"
+ "-\tres = get_user_pages_fast(uaddr, nr_pages, rw = READ, pages);\n"
+ "+\tres = get_user_pages_fast(uaddr, nr_pages, rw = READ ? FOLL_WRITE : 0,\n"
  "+\t\t\t\t  pages);\n"
  " \n"
  " \t/* Errors and no page mapped should return here */\n"
@@ -654,7 +654,7 @@
  "+\t\t\t\tpages);\n"
  " \t\tif (unlikely(res < 0))\n"
  " \t\t\treturn res;\n"
- " \t\treturn (res == n ? len : res * PAGE_SIZE) - *start;\n"
+ " \t\treturn (res = n ? len : res * PAGE_SIZE) - *start;\n"
  "@@ -1361,7 +1363,8 @@ ssize_t iov_iter_get_pages_alloc(struct iov_iter *i,\n"
  " \t\tp = get_pages_array(n);\n"
  " \t\tif (!p)\n"
@@ -746,7 +746,7 @@
  "+\t\t    num_pages - got, write_page ? FOLL_WRITE : 0, pages + got);\n"
  " \t\tif (rc < 0)\n"
  " \t\t\tbreak;\n"
- " \t\tBUG_ON(rc == 0);\n"
+ " \t\tBUG_ON(rc = 0);\n"
  "diff --git a/net/rds/info.c b/net/rds/info.c\n"
  "index e367a97a18c8..03f6fd56d237 100644\n"
  "--- a/net/rds/info.c\n"
@@ -775,11 +775,6 @@
  " \tif (ret >= 0 && ret < nr_pages) {\n"
  " \t\twhile (ret--)\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
 
-2e9f2b883794a5fe41bbfc2721277244a3fe2e6fab64e5d36aabf3ba83bf3d91
+ef5f4c6e4b7314f09b5e7d722ead7ec9eef01d195fea521df95256def8c4bc7c
