Merge 4.8-rc5 into char-misc-next

We want the fixes in here for merging and testing.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/misc/Kconfig
Simple merge

diff --cc drivers/misc/Makefile
Simple merge

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

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

diff --cc drivers/vhost/test.c
Simple merge