Merge 5.4-rc3 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 drivers/misc/fastrpc.c
Simple merge

diff --cc drivers/misc/mei/bus-fixup.c
Simple merge

diff --cc drivers/misc/mei/hw-me.c
Simple merge