Merge 4.16-rc3 into staging-next

We want the IIO/Staging fixes in here, and to resolve a merge problem
with the move of the fsl-mc code.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c
Simple merge

diff --cc drivers/staging/iio/adc/ad7192.c
Simple merge