Merge 5.2-rc6 into staging-next

We want the fixes and this resolves a merge issue as well.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/iio/adc/at91-sama5d2_adc.c
Simple merge

diff --cc drivers/iio/dac/ds4424.c
Simple merge

diff --cc drivers/staging/iio/addac/adt7316.c
Simple merge