Merge 4.10-rc7 into char-misc-next

We want the hv and other fixes in here as well to handle merge and
testing issues.

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

diff --cc MAINTAINERS
Simple merge

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

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

diff --cc init/Kconfig
Simple merge