Merge 4.13-rc7 into staging-next

We want the staging and iio fixes in here to handle the merge issues.

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

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

diff --cc drivers/iio/adc/stm32-adc-core.c
Simple merge

diff --cc drivers/iio/magnetometer/st_magn_core.c
Simple merge

diff --cc drivers/iio/trigger/stm32-timer-trigger.c
Simple merge

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