Merge 5.5-rc7 into staging-next

We want the staging fixes in here as well

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

diff --cc MAINTAINERS
Simple merge

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

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

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