Merge 5.8-rc7 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/comedi/drivers/addi_apci_1032.c
Simple merge

diff --cc drivers/staging/comedi/drivers/addi_apci_1500.c
Simple merge

diff --cc drivers/staging/comedi/drivers/addi_apci_1564.c
Simple merge

diff --cc drivers/staging/comedi/drivers/ni_6527.c
Simple merge