OSDN Git Service

Merge 4.14-rc5 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Oct 2017 07:22:22 +0000 (09:22 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Oct 2017 07:22:22 +0000 (09:22 +0200)
commit58f2c391cc0560231d7636c39d31b1b26c9396b7
tree67956eea736a8763f67be8a52bcaf0d3fe4374f4
parentc2e5df616e1ae6c2a074cb241ebb65a318ebaf7c
parent33d930e59a98fa10a0db9f56c7fa2f21a4aef9b9
Merge 4.14-rc5 into char-misc-next

We need the fixes in here to resolve merge issues and for testing.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/hv/channel_mgmt.c
drivers/hv/vmbus_drv.c
drivers/nvmem/core.c
include/linux/hyperv.h