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>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/iio/adc/Kconfig
Simple merge

diff --cc drivers/staging/android/ion/ion.c
Simple merge

diff --cc drivers/staging/greybus/arche-platform.c
Simple merge

diff --cc drivers/staging/greybus/es2.c
Simple merge

diff --cc drivers/staging/greybus/uart.c
Simple merge

diff --cc drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
index a5afcc5fd03b15983809515a8cf2161cee951dad,1091b9f1dd070e3d27c269402b43b0a09d96bcdc..12938f2898a7de8b9ee0d2eda0598714af11a3ba
--- 1/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
--- 2/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 ce3ba37fbeb07e9130a5e798d64bb95e6c103091,7b6cd4d80621e38ff6d47fcd87b45fbe9cd4259b..4e0401e1b1d01c0d7774ad2ab835c1a2b88b9cff
--- 1/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
--- 2/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);

diff --cc drivers/staging/wilc1000/host_interface.c
Simple merge