Merge 4.12-rc6 into staging-next

We want the staging fixes in here as well.

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

diff --cc drivers/iio/adc/meson_saradc.c
Simple merge

diff --cc drivers/staging/rtl8188eu/os_dep/mon.c
Simple merge