From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 16 Oct 2017 07:22:22 +0000 (+0200)
Subject: Merge 4.14-rc5 into char-misc-next
X-Git-Tag: v4.19~2172^2~62
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=58f2c391cc0560231d7636c39d31b1b26c9396b7;p=platform%2Fkernel%2Flinux-rpi.git

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>
---

58f2c391cc0560231d7636c39d31b1b26c9396b7
diff --cc drivers/hv/channel_mgmt.c
index dd2dffe,018d2e0..c942a11
--- a/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;
  	}