Merge 5.4-rc3 into staging-next

We want the staging driver fixes in here as well to build on and test
with.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
Simple merge

diff --cc drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
Simple merge

diff --cc drivers/staging/exfat/exfat_super.c
Simple merge

diff --cc drivers/staging/fbtft/fbtft-core.c
Simple merge

diff --cc drivers/staging/octeon/octeon-stubs.h
Simple merge

diff --cc drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c
Simple merge