Merge 4.13-rc5 into staging-next

We need it here for iio fixes.

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

diff --cc drivers/iio/accel/st_accel_core.c
Simple merge

diff --cc drivers/iio/common/st_sensors/st_sensors_core.c
Simple merge

diff --cc include/linux/iio/common/st_sensors.h
Simple merge