From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Sun, 30 Oct 2016 10:38:44 +0000 (-0400)
Subject: Merge 4.9-rc3 into staging-next
X-Git-Tag: v4.10-rc1~148^2~405
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=bdc065666a591fddc4e55cbdcd6c7b02f289b5ff;p=linux.git

Merge 4.9-rc3 into staging-next

This resolves a merge issue with
drivers/staging/iio/accel/sca3000_core.c and we want the fixes all in
here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

bdc065666a591fddc4e55cbdcd6c7b02f289b5ff
diff --cc drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
index a5afcc5fd03b,1091b9f1dd07..12938f2898a7
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
@@@ -420,11 -420,10 +420,10 @@@ create_pagelist(char __user *buf, size_
  		*need_release = 0; /* do not try and release vmalloc pages */
  	} else {
  		down_read(&task->mm->mmap_sem);
 -		actual_pages = get_user_pages(task, task->mm,
 +		actual_pages = get_user_pages(
  				          (unsigned long)buf & ~(PAGE_SIZE - 1),
  					  num_pages,
- 					  (type == PAGELIST_READ) /*Write */ ,
- 					  0 /*Force */ ,
+ 					  (type == PAGELIST_READ) ? FOLL_WRITE : 0,
  					  pages,
  					  NULL /*vmas */);
  		up_read(&task->mm->mmap_sem);
diff --cc drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
index ce3ba37fbeb0,7b6cd4d80621..4e0401e1b1d0
--- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
@@@ -1467,11 -1473,11 +1467,10 @@@ dump_phys_mem(void *virt_addr, uint32_
  	}
  
  	down_read(&current->mm->mmap_sem);
 -	rc = get_user_pages(current,      /* task */
 -		current->mm,              /* mm */
 +	rc = get_user_pages(
  		(unsigned long)virt_addr, /* start */
  		num_pages,                /* len */
- 		0,                        /* write */
- 		0,                        /* force */
+ 		0,                        /* gup_flags */
  		pages,                    /* pages (array of page pointers) */
  		NULL);                    /* vmas */
  	up_read(&current->mm->mmap_sem);