Merge 4.14-rc4 into staging-next

We want the staging/iio fixes in here as well to handle merge issues.

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

diff --cc arch/arm/configs/pxa_defconfig
Simple merge

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

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

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

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

diff --cc drivers/iio/adc/ti-ads1015.c
Simple merge

diff --cc drivers/iio/adc/twl4030-madc.c
Simple merge

diff --cc drivers/iio/industrialio-core.c
Simple merge

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

diff --cc drivers/iio/pressure/bmp280-core.c
Simple merge

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

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

diff --cc drivers/staging/pi433/rf69.c
Simple merge

diff --cc drivers/staging/rtl8723bs/core/rtw_mlme.c
Simple merge

diff --cc drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c
Simple merge

diff --cc drivers/staging/speakup/main.c
Simple merge

diff --cc drivers/staging/unisys/visorbus/visorchipset.c
Simple merge

diff --cc drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835_arm.c
Simple merge