Merge 4.20-rc5 into staging-next

We need the staging fixes in here as well.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/staging/media/davinci_vpfe/dm365_ipipeif.c
Simple merge

diff --cc drivers/staging/mt7621-dma/mtk-hsdma.c
Simple merge

diff --cc drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c
Simple merge

diff --cc drivers/staging/rtl8723bs/os_dep/ioctl_linux.c
Simple merge

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