From 79e643d36ace63db42ebc8a8ea856b7a19b98161 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 14 May 2019 14:23:06 +0200 Subject: [PATCH] drop mm hotplug patch from 5.0 and 5.1 as it's already in there --- ...ails-to-take-the-device_hotplug_lock.patch | 42 ------------------- queue-5.0/series | 1 - ...ails-to-take-the-device_hotplug_lock.patch | 42 ------------------- queue-5.1/series | 1 - 4 files changed, 86 deletions(-) delete mode 100644 queue-5.0/mm-memory_hotplug-do-not-unlock-when-fails-to-take-the-device_hotplug_lock.patch delete mode 100644 queue-5.1/mm-memory_hotplug-do-not-unlock-when-fails-to-take-the-device_hotplug_lock.patch diff --git a/queue-5.0/mm-memory_hotplug-do-not-unlock-when-fails-to-take-the-device_hotplug_lock.patch b/queue-5.0/mm-memory_hotplug-do-not-unlock-when-fails-to-take-the-device_hotplug_lock.patch deleted file mode 100644 index 21649023356..00000000000 --- a/queue-5.0/mm-memory_hotplug-do-not-unlock-when-fails-to-take-the-device_hotplug_lock.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d2ab99403ee00d8014e651728a4702ea1ae5e52c Mon Sep 17 00:00:00 2001 -From: zhong jiang -Date: Mon, 8 Apr 2019 12:07:17 +0800 -Subject: mm/memory_hotplug: Do not unlock when fails to take the device_hotplug_lock - -From: zhong jiang - -commit d2ab99403ee00d8014e651728a4702ea1ae5e52c upstream. - -When adding the memory by probing memory block in sysfs interface, there is an -obvious issue that we will unlock the device_hotplug_lock when fails to takes it. - -That issue was introduced in Commit 8df1d0e4a265 -("mm/memory_hotplug: make add_memory() take the device_hotplug_lock") - -We should drop out in time when fails to take the device_hotplug_lock. - -Fixes: 8df1d0e4a265 ("mm/memory_hotplug: make add_memory() take the device_hotplug_lock") -Reported-by: Yang yingliang -Signed-off-by: zhong jiang -Reviewed-by: Oscar Salvador -Reviewed-by: David Hildenbrand -Acked-by: Michal Hocko -Cc: stable -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/base/memory.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/base/memory.c -+++ b/drivers/base/memory.c -@@ -512,7 +512,7 @@ static ssize_t probe_store(struct device - MIN_MEMORY_BLOCK_SIZE * sections_per_block); - - if (ret) -- goto out; -+ return ret; - - ret = count; - out: diff --git a/queue-5.0/series b/queue-5.0/series index f3ba523c15f..2fc438fa341 100644 --- a/queue-5.0/series +++ b/queue-5.0/series @@ -101,5 +101,4 @@ drm-rockchip-fix-for-mailbox-read-validation.patch cw1200-fix-missing-unlock-on-error-in-cw1200_hw_scan.patch mwl8k-fix-rate_idx-underflow.patch rtlwifi-rtl8723ae-fix-missing-break-in-switch-statement.patch -mm-memory_hotplug-do-not-unlock-when-fails-to-take-the-device_hotplug_lock.patch don-t-jump-to-compute_result-state-from-check_result-state.patch diff --git a/queue-5.1/mm-memory_hotplug-do-not-unlock-when-fails-to-take-the-device_hotplug_lock.patch b/queue-5.1/mm-memory_hotplug-do-not-unlock-when-fails-to-take-the-device_hotplug_lock.patch deleted file mode 100644 index fa12e8046bf..00000000000 --- a/queue-5.1/mm-memory_hotplug-do-not-unlock-when-fails-to-take-the-device_hotplug_lock.patch +++ /dev/null @@ -1,42 +0,0 @@ -From d2ab99403ee00d8014e651728a4702ea1ae5e52c Mon Sep 17 00:00:00 2001 -From: zhong jiang -Date: Mon, 8 Apr 2019 12:07:17 +0800 -Subject: mm/memory_hotplug: Do not unlock when fails to take the device_hotplug_lock - -From: zhong jiang - -commit d2ab99403ee00d8014e651728a4702ea1ae5e52c upstream. - -When adding the memory by probing memory block in sysfs interface, there is an -obvious issue that we will unlock the device_hotplug_lock when fails to takes it. - -That issue was introduced in Commit 8df1d0e4a265 -("mm/memory_hotplug: make add_memory() take the device_hotplug_lock") - -We should drop out in time when fails to take the device_hotplug_lock. - -Fixes: 8df1d0e4a265 ("mm/memory_hotplug: make add_memory() take the device_hotplug_lock") -Reported-by: Yang yingliang -Signed-off-by: zhong jiang -Reviewed-by: Oscar Salvador -Reviewed-by: David Hildenbrand -Acked-by: Michal Hocko -Cc: stable -Signed-off-by: Greg Kroah-Hartman -Signed-off-by: Greg Kroah-Hartman - ---- - drivers/base/memory.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/base/memory.c -+++ b/drivers/base/memory.c -@@ -513,7 +513,7 @@ static ssize_t probe_store(struct device - MIN_MEMORY_BLOCK_SIZE * sections_per_block); - - if (ret) -- goto out; -+ return ret; - - ret = count; - out: diff --git a/queue-5.1/series b/queue-5.1/series index 8c5dd95b588..97c49e03d11 100644 --- a/queue-5.1/series +++ b/queue-5.1/series @@ -10,5 +10,4 @@ virt-vbox-sanity-check-parameter-types-for-hgcm-calls-coming-from-userspace.patc usb-serial-fix-unthrottle-races.patch mwl8k-fix-rate_idx-underflow.patch rtlwifi-rtl8723ae-fix-missing-break-in-switch-statement.patch -mm-memory_hotplug-do-not-unlock-when-fails-to-take-the-device_hotplug_lock.patch don-t-jump-to-compute_result-state-from-check_result-state.patch -- 2.47.2