Merge 4.11-rc4 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 drivers/dax/dax.c
Simple merge

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

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

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

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

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

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

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