Merge 4.20-rc6 into char-misc-next

This should resolve the hv driver merge conflict.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/hv/channel_mgmt.c
Simple merge

diff --cc drivers/hv/hyperv_vmbus.h
Simple merge

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