Merge 5.7-rc5 into char-misc-next

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

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

diff --cc drivers/bus/mhi/core/main.c
Simple merge

diff --cc drivers/bus/mhi/core/pm.c
Simple merge

diff --cc include/linux/mhi.h
Simple merge