Merge 5.4-rc7 into staging-next

We want the staging fixes in here, and it resolves some merge issues.

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

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
Simple merge

diff --cc drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h
Simple merge

diff --cc drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c
Simple merge

diff --cc drivers/staging/Kconfig
index a490141a0e88a6ed052fa45e0942c775e45e7d5b,927d29eb92c6f2bbbc0d0f1ca4b5ae9650a05f97..0f19b086865a752c8e2d938588ed29cc5effb3ec
--- 1/drivers/staging/Kconfig
--- 2/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@@ -125,6 -125,6 +125,8 @@@ source "drivers/staging/exfat/Kconfig
  
  source "drivers/staging/qlge/Kconfig"
  
+ source "drivers/staging/vboxsf/Kconfig"
+ 
 +source "drivers/staging/wfx/Kconfig"
 +
  endif # STAGING

diff --cc drivers/staging/Makefile
index 4cb548a0ff878959c4f2183def7d1f82f8cca330,f01f04199073d047cd2f92b910243a387c4ca3e4..b7c31b9fe044a9a20fa45667f2ad288398af6cb1
--- 1/drivers/staging/Makefile
--- 2/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@@ -53,4 -53,4 +53,5 @@@ obj-$(CONFIG_UWB)             += uwb
  obj-$(CONFIG_USB_WUSB)                += wusbcore/
  obj-$(CONFIG_EXFAT_FS)                += exfat/
  obj-$(CONFIG_QLGE)            += qlge/
+ obj-$(CONFIG_VBOXSF_FS)               += vboxsf/
 +obj-$(CONFIG_WFX)             += wfx/