Merge 5.0-rc4 into char-misc-next

We need the char-misc fixes in here as well.

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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/powerpc/platforms/chrp/setup.c
Simple merge

diff --cc drivers/misc/mic/vop/vop_main.c
Simple merge

diff --cc drivers/ntb/hw/mscc/ntb_hw_switchtec.c
Simple merge