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 <[email protected]>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/hv/channel_mgmt.c
index dd2dffe816be1acb01cb425d0b47d1325fe37c4b,018d2e0f8ec57b1a35c4bbc977e22e0228004d22..c942a1120cb9e826aa0e6d1415b7b8c7fd60e5b9
--- 1/drivers/hv/channel_mgmt.c
--- 2/drivers/hv/channel_mgmt.c
+++ b/drivers/hv/channel_mgmt.c
@@@ -513,16 -520,9 +520,17 @@@ static void vmbus_process_offer(struct 
        newchannel->state = CHANNEL_OPEN_STATE;
  
        if (!fnew) {
 +              struct hv_device *dev
 +                      = newchannel->primary_channel->device_obj;
 +
 +              if (vmbus_add_channel_kobj(dev, newchannel)) {
 +                      atomic_dec(&vmbus_connection.offer_in_progress);
 +                      goto err_free_chan;
 +              }
 +
                if (channel->sc_creation_callback != NULL)
                        channel->sc_creation_callback(newchannel);
+               newchannel->probe_done = true;
                return;
        }
  

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

diff --cc drivers/nvmem/core.c
Simple merge

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