drop mm hotplug patch from 5.0 and 5.1 as it's already in there

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 (file)
index 2164902..0000000
--- 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 <zhongjiang@huawei.com>
-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 <zhongjiang@huawei.com>
-
-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 <yangyingliang@huawei.com>
-Signed-off-by: zhong jiang <zhongjiang@huawei.com>
-Reviewed-by: Oscar Salvador <osalvador@suse.de>
-Reviewed-by: David Hildenbrand <david@redhat.com>
-Acked-by: Michal Hocko <mhocko@suse.com>
-Cc: stable <stable@vger.kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- 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 f3ba523c15fd524492dce0166ae4869f77ce75ac..2fc438fa3413185bdde918f312871f9628bd0489 100644 (file)
--- 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 (file)
index fa12e80..0000000
--- 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 <zhongjiang@huawei.com>
-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 <zhongjiang@huawei.com>
-
-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 <yangyingliang@huawei.com>
-Signed-off-by: zhong jiang <zhongjiang@huawei.com>
-Reviewed-by: Oscar Salvador <osalvador@suse.de>
-Reviewed-by: David Hildenbrand <david@redhat.com>
-Acked-by: Michal Hocko <mhocko@suse.com>
-Cc: stable <stable@vger.kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- 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 8c5dd95b5886c2d8dcfc4b44a2728e1e93292faf..97c49e03d1199e87fb36f7ef0febc44ccbd900a9 100644 (file)
--- 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