Merge 4.11-rc4 into staging-next

We need the IIO fixes in here as well to handle merge issues.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c
Simple merge

diff --cc drivers/staging/vc04_services/Kconfig
index 136baeaea57d06b9a5736187c6ae09b84497133d,74094fff4367813a03e5fb59357a1e1054ea002d..9e2763663ab869c72dc47a9a42b21153a8b52ce0
--- 1/drivers/staging/vc04_services/Kconfig
--- 2/drivers/staging/vc04_services/Kconfig
+++ b/drivers/staging/vc04_services/Kconfig
@@@ -1,17 -1,9 +1,18 @@@
 -config BCM2835_VCHIQ
 -      tristate "Videocore VCHIQ"
 +menuconfig BCM_VIDEOCORE
 +      tristate "Broadcom VideoCore support"
        depends on HAS_DMA
+       depends on OF
        depends on RASPBERRYPI_FIRMWARE || (COMPILE_TEST && !RASPBERRYPI_FIRMWARE)
        default y
 +      help
 +              Support for Broadcom VideoCore services including
 +              the BCM2835 family of products which is used
 +              by the Raspberry PI.
 +
 +if BCM_VIDEOCORE
 +
 +config BCM2835_VCHIQ
 +      tristate "BCM2835 VCHIQ"
        help
                Kernel to VideoCore communication interface for the
                BCM2835 family of products.