Merge 4.20-rc6 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 10 Dec 2018 08:22:34 +0000 (09:22 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 10 Dec 2018 08:22:34 +0000 (09:22 +0100)
commitc4aa8b2a8b63a269d63acafc0358a7b9f5d9e563
treed04a7861e542665bb7c03aac729a72c957be8abc
parent48d365de7746a000afd7f9f7cc1821cbb6fe9b45
parent40e020c129cfc991e8ab4736d2665351ffd1468d
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>
MAINTAINERS
drivers/hv/channel_mgmt.c
drivers/hv/hyperv_vmbus.h
include/linux/hyperv.h