diff --git a/kernel/Makefile b/kernel/Makefile index 658d9e983..96e1acafe 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -219,21 +219,21 @@ endef # ifeq ($(ARCH),x86_64) $(eval $(call kernel,4.17.2,4.17.x,$(EXTRA),$(DEBUG))) -$(eval $(call kernel,4.16.16,4.16.x,$(EXTRA),$(DEBUG))) -$(eval $(call kernel,4.14.50,4.14.x,$(EXTRA),$(DEBUG))) -$(eval $(call kernel,4.14.50,4.14.x,,-dbg)) +$(eval $(call kernel,4.16.17,4.16.x,$(EXTRA),$(DEBUG))) +$(eval $(call kernel,4.14.51,4.14.x,$(EXTRA),$(DEBUG))) +$(eval $(call kernel,4.14.51,4.14.x,,-dbg)) $(eval $(call kernel,4.14.40,4.14.x,-rt,)) $(eval $(call kernel,4.9.109,4.9.x,$(EXTRA),$(DEBUG))) -$(eval $(call kernel,4.4.137,4.4.x,$(EXTRA),$(DEBUG))) +$(eval $(call kernel,4.4.138,4.4.x,$(EXTRA),$(DEBUG))) else ifeq ($(ARCH),aarch64) $(eval $(call kernel,4.17.2,4.17.x,$(EXTRA),$(DEBUG))) -$(eval $(call kernel,4.14.50,4.14.x,$(EXTRA),$(DEBUG))) +$(eval $(call kernel,4.14.51,4.14.x,$(EXTRA),$(DEBUG))) $(eval $(call kernel,4.14.40,4.14.x,-rt,)) else ifeq ($(ARCH),s390x) $(eval $(call kernel,4.17.2,4.17.x,$(EXTRA),$(DEBUG))) -$(eval $(call kernel,4.14.50,4.14.x,$(EXTRA),$(DEBUG))) +$(eval $(call kernel,4.14.51,4.14.x,$(EXTRA),$(DEBUG))) endif # Target for kernel config diff --git a/kernel/config-4.14.x-aarch64 b/kernel/config-4.14.x-aarch64 index e00a7b16a..76bc5ddb9 100644 --- a/kernel/config-4.14.x-aarch64 +++ b/kernel/config-4.14.x-aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.14.50 Kernel Configuration +# Linux/arm64 4.14.51 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y diff --git a/kernel/config-4.14.x-s390x b/kernel/config-4.14.x-s390x index 16072bc23..ff84b1b1a 100644 --- a/kernel/config-4.14.x-s390x +++ b/kernel/config-4.14.x-s390x @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/s390 4.14.50 Kernel Configuration +# Linux/s390 4.14.51 Kernel Configuration # CONFIG_MMU=y CONFIG_ZONE_DMA=y diff --git a/kernel/config-4.14.x-x86_64 b/kernel/config-4.14.x-x86_64 index d05b2c6a1..d25c8c563 100644 --- a/kernel/config-4.14.x-x86_64 +++ b/kernel/config-4.14.x-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.14.50 Kernel Configuration +# Linux/x86 4.14.51 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/kernel/config-4.16.x-x86_64 b/kernel/config-4.16.x-x86_64 index 4e6c86d18..89a759175 100644 --- a/kernel/config-4.16.x-x86_64 +++ b/kernel/config-4.16.x-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.16.16 Kernel Configuration +# Linux/x86 4.16.17 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/kernel/config-4.4.x-x86_64 b/kernel/config-4.4.x-x86_64 index 850c74918..5b70aac10 100644 --- a/kernel/config-4.4.x-x86_64 +++ b/kernel/config-4.4.x-x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.4.137 Kernel Configuration +# Linux/x86 4.4.138 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y diff --git a/kernel/patches-4.14.x/0001-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch b/kernel/patches-4.14.x/0001-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch index a916de40b..4946c44af 100644 --- a/kernel/patches-4.14.x/0001-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch +++ b/kernel/patches-4.14.x/0001-NVDIMM-reducded-ND_MIN_NAMESPACE_SIZE-from-4MB-to-4K.patch @@ -1,4 +1,4 @@ -From 013e0499cb2793bfba544b04c3207699e9e34e61 Mon Sep 17 00:00:00 2001 +From 644f60c8aa5790fb3f1b21c600c210e727c3fbde Mon Sep 17 00:00:00 2001 From: Cheng-mean Liu Date: Tue, 11 Jul 2017 16:58:26 -0700 Subject: [PATCH 01/21] NVDIMM: reducded ND_MIN_NAMESPACE_SIZE from 4MB to 4KB diff --git a/kernel/patches-4.14.x/0002-hyper-v-trace-vmbus_on_msg_dpc.patch b/kernel/patches-4.14.x/0002-hyper-v-trace-vmbus_on_msg_dpc.patch index ec2964c2a..6301d6375 100644 --- a/kernel/patches-4.14.x/0002-hyper-v-trace-vmbus_on_msg_dpc.patch +++ b/kernel/patches-4.14.x/0002-hyper-v-trace-vmbus_on_msg_dpc.patch @@ -1,4 +1,4 @@ -From 5596bdce0513e632ce8377e8c77da30f036572f6 Mon Sep 17 00:00:00 2001 +From 62f7357c48d5d8096b5efb31b46d4fed56930193 Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:00 -0700 Subject: [PATCH 02/21] hyper-v: trace vmbus_on_msg_dpc() diff --git a/kernel/patches-4.14.x/0003-hyper-v-trace-vmbus_on_message.patch b/kernel/patches-4.14.x/0003-hyper-v-trace-vmbus_on_message.patch index e75c5a393..5dcf93305 100644 --- a/kernel/patches-4.14.x/0003-hyper-v-trace-vmbus_on_message.patch +++ b/kernel/patches-4.14.x/0003-hyper-v-trace-vmbus_on_message.patch @@ -1,4 +1,4 @@ -From 696e550e57c7a5b578b1437d15f1928838b662a5 Mon Sep 17 00:00:00 2001 +From 5b29f228a34b2fa31901d579b297e6b2ed3c5a88 Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:01 -0700 Subject: [PATCH 03/21] hyper-v: trace vmbus_on_message() diff --git a/kernel/patches-4.14.x/0004-hyper-v-trace-vmbus_onoffer.patch b/kernel/patches-4.14.x/0004-hyper-v-trace-vmbus_onoffer.patch index 690cb59c4..00ea03698 100644 --- a/kernel/patches-4.14.x/0004-hyper-v-trace-vmbus_onoffer.patch +++ b/kernel/patches-4.14.x/0004-hyper-v-trace-vmbus_onoffer.patch @@ -1,4 +1,4 @@ -From 4e413fab059c767064785bd4b88411028383fbfb Mon Sep 17 00:00:00 2001 +From 44e6a68b597023268a7a2c1d7a2b9e9a0fc4afca Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:02 -0700 Subject: [PATCH 04/21] hyper-v: trace vmbus_onoffer() diff --git a/kernel/patches-4.14.x/0005-hyper-v-trace-vmbus_onoffer_rescind.patch b/kernel/patches-4.14.x/0005-hyper-v-trace-vmbus_onoffer_rescind.patch index 51fcdd0b1..d21333770 100644 --- a/kernel/patches-4.14.x/0005-hyper-v-trace-vmbus_onoffer_rescind.patch +++ b/kernel/patches-4.14.x/0005-hyper-v-trace-vmbus_onoffer_rescind.patch @@ -1,4 +1,4 @@ -From c5cc4c4570fa5b920447dfeeebd0373887a9abf2 Mon Sep 17 00:00:00 2001 +From 32752193fe3edb67439c574935a09ebdb57866b2 Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:03 -0700 Subject: [PATCH 05/21] hyper-v: trace vmbus_onoffer_rescind() diff --git a/kernel/patches-4.14.x/0006-hyper-v-trace-vmbus_onopen_result.patch b/kernel/patches-4.14.x/0006-hyper-v-trace-vmbus_onopen_result.patch index fd6872758..67a433c80 100644 --- a/kernel/patches-4.14.x/0006-hyper-v-trace-vmbus_onopen_result.patch +++ b/kernel/patches-4.14.x/0006-hyper-v-trace-vmbus_onopen_result.patch @@ -1,4 +1,4 @@ -From bddab20769865e42b70ca3b06b8983efdf9ba8ab Mon Sep 17 00:00:00 2001 +From 4a6dcedfe6f75d6c1547c48a3238375471168c52 Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:04 -0700 Subject: [PATCH 06/21] hyper-v: trace vmbus_onopen_result() diff --git a/kernel/patches-4.14.x/0007-hyper-v-trace-vmbus_ongpadl_created.patch b/kernel/patches-4.14.x/0007-hyper-v-trace-vmbus_ongpadl_created.patch index c9577c5fc..a7cfbdc7b 100644 --- a/kernel/patches-4.14.x/0007-hyper-v-trace-vmbus_ongpadl_created.patch +++ b/kernel/patches-4.14.x/0007-hyper-v-trace-vmbus_ongpadl_created.patch @@ -1,4 +1,4 @@ -From cdf0de3641ff147934c3ed9ef33b64a1693be4f9 Mon Sep 17 00:00:00 2001 +From 53e064e416ee6b43f375fb013be58859d1900c6e Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:05 -0700 Subject: [PATCH 07/21] hyper-v: trace vmbus_ongpadl_created() diff --git a/kernel/patches-4.14.x/0008-hyper-v-trace-vmbus_ongpadl_torndown.patch b/kernel/patches-4.14.x/0008-hyper-v-trace-vmbus_ongpadl_torndown.patch index 5c4ccef51..985ee3a80 100644 --- a/kernel/patches-4.14.x/0008-hyper-v-trace-vmbus_ongpadl_torndown.patch +++ b/kernel/patches-4.14.x/0008-hyper-v-trace-vmbus_ongpadl_torndown.patch @@ -1,4 +1,4 @@ -From f9355122b33730009a4d7d3d3a0ce0eaa20889ed Mon Sep 17 00:00:00 2001 +From 433a94ef63082c256c4254ae5024c5a94c7fffce Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:06 -0700 Subject: [PATCH 08/21] hyper-v: trace vmbus_ongpadl_torndown() diff --git a/kernel/patches-4.14.x/0009-hyper-v-trace-vmbus_onversion_response.patch b/kernel/patches-4.14.x/0009-hyper-v-trace-vmbus_onversion_response.patch index b98f10ab7..72980ea98 100644 --- a/kernel/patches-4.14.x/0009-hyper-v-trace-vmbus_onversion_response.patch +++ b/kernel/patches-4.14.x/0009-hyper-v-trace-vmbus_onversion_response.patch @@ -1,4 +1,4 @@ -From d99a30b30f06088d07a3faeb0d4db3c181302fc8 Mon Sep 17 00:00:00 2001 +From ae11340c0fba00db565b838b611a30284ed37965 Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:07 -0700 Subject: [PATCH 09/21] hyper-v: trace vmbus_onversion_response() diff --git a/kernel/patches-4.14.x/0010-hyper-v-trace-vmbus_request_offers.patch b/kernel/patches-4.14.x/0010-hyper-v-trace-vmbus_request_offers.patch index f95d4c11e..f43b2dc85 100644 --- a/kernel/patches-4.14.x/0010-hyper-v-trace-vmbus_request_offers.patch +++ b/kernel/patches-4.14.x/0010-hyper-v-trace-vmbus_request_offers.patch @@ -1,4 +1,4 @@ -From 2eb7d56797cde8a4e7e155961619c78de6ab7bc4 Mon Sep 17 00:00:00 2001 +From 05b470e412a3f5c9980a937425a587b31a1d4a6a Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:08 -0700 Subject: [PATCH 10/21] hyper-v: trace vmbus_request_offers() diff --git a/kernel/patches-4.14.x/0011-hyper-v-trace-vmbus_open.patch b/kernel/patches-4.14.x/0011-hyper-v-trace-vmbus_open.patch index ed5fffd7d..30d39aaa0 100644 --- a/kernel/patches-4.14.x/0011-hyper-v-trace-vmbus_open.patch +++ b/kernel/patches-4.14.x/0011-hyper-v-trace-vmbus_open.patch @@ -1,4 +1,4 @@ -From 1f21a2f467e2a49ba0d3663f92cced34fcd63c7a Mon Sep 17 00:00:00 2001 +From ea7281c4e23f5a341686702a6d02cf77bac9d83c Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:09 -0700 Subject: [PATCH 11/21] hyper-v: trace vmbus_open() diff --git a/kernel/patches-4.14.x/0012-hyper-v-trace-vmbus_close_internal.patch b/kernel/patches-4.14.x/0012-hyper-v-trace-vmbus_close_internal.patch index 437c35ac3..b5883065c 100644 --- a/kernel/patches-4.14.x/0012-hyper-v-trace-vmbus_close_internal.patch +++ b/kernel/patches-4.14.x/0012-hyper-v-trace-vmbus_close_internal.patch @@ -1,4 +1,4 @@ -From 84c01865de1af10fafe0b7417880dd2b5e24342e Mon Sep 17 00:00:00 2001 +From 4610b1d4aa71360ed1380e13f0584e8e13a4bfdd Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:10 -0700 Subject: [PATCH 12/21] hyper-v: trace vmbus_close_internal() diff --git a/kernel/patches-4.14.x/0013-hyper-v-trace-vmbus_establish_gpadl.patch b/kernel/patches-4.14.x/0013-hyper-v-trace-vmbus_establish_gpadl.patch index 321559190..7e1b5292a 100644 --- a/kernel/patches-4.14.x/0013-hyper-v-trace-vmbus_establish_gpadl.patch +++ b/kernel/patches-4.14.x/0013-hyper-v-trace-vmbus_establish_gpadl.patch @@ -1,4 +1,4 @@ -From fbfc821968ed53b4224254d7b0cdcfd861ec86ed Mon Sep 17 00:00:00 2001 +From 416a92bab8c23e20be58ea75d00be5cb8488f2fe Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:11 -0700 Subject: [PATCH 13/21] hyper-v: trace vmbus_establish_gpadl() diff --git a/kernel/patches-4.14.x/0014-hyper-v-trace-vmbus_teardown_gpadl.patch b/kernel/patches-4.14.x/0014-hyper-v-trace-vmbus_teardown_gpadl.patch index a8c9ed854..2dd827b1c 100644 --- a/kernel/patches-4.14.x/0014-hyper-v-trace-vmbus_teardown_gpadl.patch +++ b/kernel/patches-4.14.x/0014-hyper-v-trace-vmbus_teardown_gpadl.patch @@ -1,4 +1,4 @@ -From 8005ebc9db93c3b5788f196500d3c656fc56d978 Mon Sep 17 00:00:00 2001 +From 3f8931e6873860bc80880bd557ccbb0f13ede412 Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:12 -0700 Subject: [PATCH 14/21] hyper-v: trace vmbus_teardown_gpadl() diff --git a/kernel/patches-4.14.x/0015-hyper-v-trace-vmbus_negotiate_version.patch b/kernel/patches-4.14.x/0015-hyper-v-trace-vmbus_negotiate_version.patch index 422e8fe69..9f9cade1c 100644 --- a/kernel/patches-4.14.x/0015-hyper-v-trace-vmbus_negotiate_version.patch +++ b/kernel/patches-4.14.x/0015-hyper-v-trace-vmbus_negotiate_version.patch @@ -1,4 +1,4 @@ -From b67817853a586c119ea2ebd10058ae4da3159aeb Mon Sep 17 00:00:00 2001 +From 9419db6af7eb4087382c84dcd9e0bd353c71441b Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:13 -0700 Subject: [PATCH 15/21] hyper-v: trace vmbus_negotiate_version() diff --git a/kernel/patches-4.14.x/0016-hyper-v-trace-vmbus_release_relid.patch b/kernel/patches-4.14.x/0016-hyper-v-trace-vmbus_release_relid.patch index e1e0bbce0..8505572e7 100644 --- a/kernel/patches-4.14.x/0016-hyper-v-trace-vmbus_release_relid.patch +++ b/kernel/patches-4.14.x/0016-hyper-v-trace-vmbus_release_relid.patch @@ -1,4 +1,4 @@ -From 058e58283d14be4b382f3e26a874489188f55344 Mon Sep 17 00:00:00 2001 +From 86a367648fd51094bf499bd86630e56ffa689373 Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:14 -0700 Subject: [PATCH 16/21] hyper-v: trace vmbus_release_relid() diff --git a/kernel/patches-4.14.x/0017-hyper-v-trace-vmbus_send_tl_connect_request.patch b/kernel/patches-4.14.x/0017-hyper-v-trace-vmbus_send_tl_connect_request.patch index 2bdc23003..4b4714665 100644 --- a/kernel/patches-4.14.x/0017-hyper-v-trace-vmbus_send_tl_connect_request.patch +++ b/kernel/patches-4.14.x/0017-hyper-v-trace-vmbus_send_tl_connect_request.patch @@ -1,4 +1,4 @@ -From b64e5c223dab937f00b0528c6b626c310d945739 Mon Sep 17 00:00:00 2001 +From 8596dad1c285c67bc4fd3d9cca4c9d46501e55b0 Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:15 -0700 Subject: [PATCH 17/21] hyper-v: trace vmbus_send_tl_connect_request() diff --git a/kernel/patches-4.14.x/0018-hyper-v-trace-channel-events.patch b/kernel/patches-4.14.x/0018-hyper-v-trace-channel-events.patch index d641f8a71..ef01e8b1c 100644 --- a/kernel/patches-4.14.x/0018-hyper-v-trace-channel-events.patch +++ b/kernel/patches-4.14.x/0018-hyper-v-trace-channel-events.patch @@ -1,4 +1,4 @@ -From 4c994cad6edc34ee7bf6bf815718ab258e496fdd Mon Sep 17 00:00:00 2001 +From 61ba337bf4a99f369ea7b461dd07f97079baf00e Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov Date: Sun, 29 Oct 2017 12:21:16 -0700 Subject: [PATCH 18/21] hyper-v: trace channel events diff --git a/kernel/patches-4.14.x/0019-serial-forbid-8250-on-s390.patch b/kernel/patches-4.14.x/0019-serial-forbid-8250-on-s390.patch index 9e453bb6f..7f43882cf 100644 --- a/kernel/patches-4.14.x/0019-serial-forbid-8250-on-s390.patch +++ b/kernel/patches-4.14.x/0019-serial-forbid-8250-on-s390.patch @@ -1,4 +1,4 @@ -From e4aec8f1d3fbd40e016ea8705e8d8b556964a8a6 Mon Sep 17 00:00:00 2001 +From dfe37b8ac4a9a5e30e687edf117f93d1278edcea Mon Sep 17 00:00:00 2001 From: Christian Borntraeger Date: Tue, 12 Dec 2017 09:08:35 +0100 Subject: [PATCH 19/21] serial: forbid 8250 on s390 diff --git a/kernel/patches-4.14.x/0020-scsi-storvsc-Allow-only-one-remove-lun-work-item-to-.patch b/kernel/patches-4.14.x/0020-scsi-storvsc-Allow-only-one-remove-lun-work-item-to-.patch index a2dbcd0ea..9eb3532ac 100644 --- a/kernel/patches-4.14.x/0020-scsi-storvsc-Allow-only-one-remove-lun-work-item-to-.patch +++ b/kernel/patches-4.14.x/0020-scsi-storvsc-Allow-only-one-remove-lun-work-item-to-.patch @@ -1,4 +1,4 @@ -From b1e3daa4f55d58deaf5346b650b297df552a22c3 Mon Sep 17 00:00:00 2001 +From 2d7924da71583ca1feeed323ed83e15de68d7460 Mon Sep 17 00:00:00 2001 From: Cathy Avery Date: Tue, 31 Oct 2017 08:52:06 -0400 Subject: [PATCH 20/21] scsi: storvsc: Allow only one remove lun work item to @@ -29,7 +29,7 @@ Signed-off-by: Martin K. Petersen 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c -index c44de0b4a995..d0f5417ed20a 100644 +index beb585ddc07d..e94f75e25cb1 100644 --- a/drivers/scsi/storvsc_drv.c +++ b/drivers/scsi/storvsc_drv.c @@ -486,6 +486,7 @@ struct hv_host_device { @@ -57,7 +57,7 @@ index c44de0b4a995..d0f5417ed20a 100644 } -@@ -1804,10 +1806,19 @@ static int storvsc_probe(struct hv_device *device, +@@ -1807,10 +1809,19 @@ static int storvsc_probe(struct hv_device *device, if (stor_device->num_sc != 0) host->nr_hw_queues = stor_device->num_sc + 1; @@ -78,7 +78,7 @@ index c44de0b4a995..d0f5417ed20a 100644 if (!dev_is_ide) { scsi_scan_host(host); -@@ -1816,7 +1827,7 @@ static int storvsc_probe(struct hv_device *device, +@@ -1819,7 +1830,7 @@ static int storvsc_probe(struct hv_device *device, device->dev_instance.b[4]); ret = scsi_add_device(host, 0, target, 0); if (ret) @@ -87,7 +87,7 @@ index c44de0b4a995..d0f5417ed20a 100644 } #if IS_ENABLED(CONFIG_SCSI_FC_ATTRS) if (host->transportt == fc_transport_template) { -@@ -1827,17 +1838,21 @@ static int storvsc_probe(struct hv_device *device, +@@ -1830,17 +1841,21 @@ static int storvsc_probe(struct hv_device *device, fc_host_node_name(host) = stor_device->node_name; fc_host_port_name(host) = stor_device->port_name; stor_device->rport = fc_remote_port_add(host, 0, &ids); @@ -111,7 +111,7 @@ index c44de0b4a995..d0f5417ed20a 100644 err_out2: /* * Once we have connected with the host, we would need to -@@ -1861,6 +1876,7 @@ static int storvsc_remove(struct hv_device *dev) +@@ -1864,6 +1879,7 @@ static int storvsc_remove(struct hv_device *dev) { struct storvsc_device *stor_device = hv_get_drvdata(dev); struct Scsi_Host *host = stor_device->host; @@ -119,7 +119,7 @@ index c44de0b4a995..d0f5417ed20a 100644 #if IS_ENABLED(CONFIG_SCSI_FC_ATTRS) if (host->transportt == fc_transport_template) { -@@ -1868,6 +1884,7 @@ static int storvsc_remove(struct hv_device *dev) +@@ -1871,6 +1887,7 @@ static int storvsc_remove(struct hv_device *dev) fc_remove_host(host); } #endif diff --git a/kernel/patches-4.14.x/0021-scsi-storvsc-Avoid-excessive-host-scan-on-controller.patch b/kernel/patches-4.14.x/0021-scsi-storvsc-Avoid-excessive-host-scan-on-controller.patch index d6459873b..2b238da54 100644 --- a/kernel/patches-4.14.x/0021-scsi-storvsc-Avoid-excessive-host-scan-on-controller.patch +++ b/kernel/patches-4.14.x/0021-scsi-storvsc-Avoid-excessive-host-scan-on-controller.patch @@ -1,4 +1,4 @@ -From 3ea009549840796f0c2c1fb2f75dea4e1184063b Mon Sep 17 00:00:00 2001 +From 44e185de2d39cd9b1654b1346872e5590250e9ca Mon Sep 17 00:00:00 2001 From: Long Li Date: Tue, 31 Oct 2017 14:58:08 -0700 Subject: [PATCH 21/21] scsi: storvsc: Avoid excessive host scan on controller @@ -24,7 +24,7 @@ Signed-off-by: Martin K. Petersen 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c -index d0f5417ed20a..819afb3bfcf4 100644 +index e94f75e25cb1..66b1b6ad0ae0 100644 --- a/drivers/scsi/storvsc_drv.c +++ b/drivers/scsi/storvsc_drv.c @@ -487,6 +487,8 @@ struct hv_host_device { @@ -89,7 +89,7 @@ index d0f5417ed20a..819afb3bfcf4 100644 break; case VSTOR_OPERATION_FCHBA_DATA: -@@ -1747,6 +1741,7 @@ static int storvsc_probe(struct hv_device *device, +@@ -1750,6 +1744,7 @@ static int storvsc_probe(struct hv_device *device, host_dev->port = host->host_no; host_dev->dev = device; @@ -97,7 +97,7 @@ index d0f5417ed20a..819afb3bfcf4 100644 stor_device = kzalloc(sizeof(struct storvsc_device), GFP_KERNEL); -@@ -1815,6 +1810,7 @@ static int storvsc_probe(struct hv_device *device, +@@ -1818,6 +1813,7 @@ static int storvsc_probe(struct hv_device *device, host->host_no); if (!host_dev->handle_error_wq) goto err_out2;