Merge 4.18-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 MAINTAINERS
Simple merge

diff --cc arch/x86/hyperv/hv_init.c
Simple merge

diff --cc arch/x86/include/asm/mshyperv.h
Simple merge

diff --cc drivers/misc/mei/interrupt.c
Simple merge

diff --cc drivers/misc/vmw_balloon.c
Simple merge

diff --cc drivers/net/hyperv/netvsc_drv.c
Simple merge

diff --cc drivers/nvmem/core.c
Simple merge