Merge 5.5-rc2 into staging-next

We want the staging driver fixes in here, and this resolves merge issues
with the isdn code that was pointed out in linux-next

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

diff --cc MAINTAINERS
Simple merge

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

diff --cc drivers/staging/qlge/qlge_ethtool.c
Simple merge