From: Greg Kroah-Hartman Date: Tue, 10 May 2022 13:01:07 +0000 (+0200) Subject: drop duplicate hwmon patch X-Git-Tag: v4.9.313~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f0ab51ccc6b15fcf6b99f626134720b0832a6ffc;p=thirdparty%2Fkernel%2Fstable-queue.git drop duplicate hwmon patch --- diff --git a/queue-4.14/hwmon-adt7470-fix-warning-on-module-removal.patch-27384 b/queue-4.14/hwmon-adt7470-fix-warning-on-module-removal.patch-27384 deleted file mode 100644 index 59b8b7f2675..00000000000 --- a/queue-4.14/hwmon-adt7470-fix-warning-on-module-removal.patch-27384 +++ /dev/null @@ -1,49 +0,0 @@ -From eb88531a51cb3b05a62719e2092376bb1108aff5 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 7 Apr 2022 12:13:12 +0200 -Subject: hwmon: (adt7470) Fix warning on module removal - -From: Armin Wolf - -[ Upstream commit 7b2666ce445c700b8dcee994da44ddcf050a0842 ] - -When removing the adt7470 module, a warning might be printed: - -do not call blocking ops when !TASK_RUNNING; state=1 -set at [] adt7470_update_thread+0x7b/0x130 [adt7470] - -This happens because adt7470_update_thread() can leave the kthread in -TASK_INTERRUPTIBLE state when the kthread is being stopped before -the call of set_current_state(). Since kthread_exit() might sleep in -exit_signals(), the warning is printed. -Fix that by using schedule_timeout_interruptible() and removing -the call of set_current_state(). -This causes TASK_INTERRUPTIBLE to be set after kthread_should_stop() -which might cause the kthread to exit. - -Reported-by: Zheyu Ma -Fixes: 93cacfd41f82 (hwmon: (adt7470) Allow faster removal) -Signed-off-by: Armin Wolf -Tested-by: Zheyu Ma -Link: https://lore.kernel.org/r/20220407101312.13331-1-W_Armin@gmx.de -Signed-off-by: Guenter Roeck -Signed-off-by: Sasha Levin ---- - drivers/hwmon/adt7470.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/hwmon/adt7470.c b/drivers/hwmon/adt7470.c -index 6876e3817850..22350c705ab3 100644 ---- a/drivers/hwmon/adt7470.c -+++ b/drivers/hwmon/adt7470.c -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.35.1 - diff --git a/queue-4.14/series b/queue-4.14/series index d73c7d813ff..3cf78b6f4cd 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -70,7 +70,6 @@ net-emaclite-add-error-handling-for-of_address_to_resource.patch smsc911x-allow-using-irq0.patch btrfs-always-log-symlinks-in-full-mode.patch net-igmp-respect-rcu-rules-in-ip_mc_source-and-ip_mc_msfilter.patch -hwmon-adt7470-fix-warning-on-module-removal.patch-27384 kvm-x86-cpuid-only-provide-cpuid-leaf-0xa-if-host-ha.patch net-ipv6-ensure-we-call-ipv6_mc_down-at-most-once.patch dm-fix-mempool-null-pointer-race-when-completing-io.patch diff --git a/queue-4.19/hwmon-adt7470-fix-warning-on-module-removal.patch-23920 b/queue-4.19/hwmon-adt7470-fix-warning-on-module-removal.patch-23920 deleted file mode 100644 index 951ba59a9b9..00000000000 --- a/queue-4.19/hwmon-adt7470-fix-warning-on-module-removal.patch-23920 +++ /dev/null @@ -1,49 +0,0 @@ -From 9405929714bd8d8b913096bf8dbd23eb3b97527f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 7 Apr 2022 12:13:12 +0200 -Subject: hwmon: (adt7470) Fix warning on module removal - -From: Armin Wolf - -[ Upstream commit 7b2666ce445c700b8dcee994da44ddcf050a0842 ] - -When removing the adt7470 module, a warning might be printed: - -do not call blocking ops when !TASK_RUNNING; state=1 -set at [] adt7470_update_thread+0x7b/0x130 [adt7470] - -This happens because adt7470_update_thread() can leave the kthread in -TASK_INTERRUPTIBLE state when the kthread is being stopped before -the call of set_current_state(). Since kthread_exit() might sleep in -exit_signals(), the warning is printed. -Fix that by using schedule_timeout_interruptible() and removing -the call of set_current_state(). -This causes TASK_INTERRUPTIBLE to be set after kthread_should_stop() -which might cause the kthread to exit. - -Reported-by: Zheyu Ma -Fixes: 93cacfd41f82 (hwmon: (adt7470) Allow faster removal) -Signed-off-by: Armin Wolf -Tested-by: Zheyu Ma -Link: https://lore.kernel.org/r/20220407101312.13331-1-W_Armin@gmx.de -Signed-off-by: Guenter Roeck -Signed-off-by: Sasha Levin ---- - drivers/hwmon/adt7470.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/hwmon/adt7470.c b/drivers/hwmon/adt7470.c -index 6876e3817850..22350c705ab3 100644 ---- a/drivers/hwmon/adt7470.c -+++ b/drivers/hwmon/adt7470.c -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.35.1 - diff --git a/queue-4.19/series b/queue-4.19/series index b9b0ac9c813..d578dd7feff 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -78,7 +78,6 @@ selftests-mirror_gre_bridge_1q-avoid-changing-pvid-while-interface-is-operationa smsc911x-allow-using-irq0.patch btrfs-always-log-symlinks-in-full-mode.patch net-igmp-respect-rcu-rules-in-ip_mc_source-and-ip_mc_msfilter.patch -hwmon-adt7470-fix-warning-on-module-removal.patch-23920 kvm-x86-cpuid-only-provide-cpuid-leaf-0xa-if-host-ha.patch mm-fix-unexpected-zeroed-page-mapping-with-zram-swap.patch tcp-make-sure-treq-af_specific-is-initialized.patch diff --git a/queue-4.9/hwmon-adt7470-fix-warning-on-module-removal.patch-27037 b/queue-4.9/hwmon-adt7470-fix-warning-on-module-removal.patch-27037 deleted file mode 100644 index c003adec58b..00000000000 --- a/queue-4.9/hwmon-adt7470-fix-warning-on-module-removal.patch-27037 +++ /dev/null @@ -1,49 +0,0 @@ -From dc4321e9e4732a2f0be9d1f552a10c74b1102a83 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 7 Apr 2022 12:13:12 +0200 -Subject: hwmon: (adt7470) Fix warning on module removal - -From: Armin Wolf - -[ Upstream commit 7b2666ce445c700b8dcee994da44ddcf050a0842 ] - -When removing the adt7470 module, a warning might be printed: - -do not call blocking ops when !TASK_RUNNING; state=1 -set at [] adt7470_update_thread+0x7b/0x130 [adt7470] - -This happens because adt7470_update_thread() can leave the kthread in -TASK_INTERRUPTIBLE state when the kthread is being stopped before -the call of set_current_state(). Since kthread_exit() might sleep in -exit_signals(), the warning is printed. -Fix that by using schedule_timeout_interruptible() and removing -the call of set_current_state(). -This causes TASK_INTERRUPTIBLE to be set after kthread_should_stop() -which might cause the kthread to exit. - -Reported-by: Zheyu Ma -Fixes: 93cacfd41f82 (hwmon: (adt7470) Allow faster removal) -Signed-off-by: Armin Wolf -Tested-by: Zheyu Ma -Link: https://lore.kernel.org/r/20220407101312.13331-1-W_Armin@gmx.de -Signed-off-by: Guenter Roeck -Signed-off-by: Sasha Levin ---- - drivers/hwmon/adt7470.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/hwmon/adt7470.c b/drivers/hwmon/adt7470.c -index 474f226e0891..9d68d00bd2e0 100644 ---- a/drivers/hwmon/adt7470.c -+++ b/drivers/hwmon/adt7470.c -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.35.1 - diff --git a/queue-4.9/series b/queue-4.9/series index 5f5a84cd6dc..e398e653774 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -59,7 +59,6 @@ net-emaclite-add-error-handling-for-of_address_to_resource.patch smsc911x-allow-using-irq0.patch btrfs-always-log-symlinks-in-full-mode.patch net-igmp-respect-rcu-rules-in-ip_mc_source-and-ip_mc_msfilter.patch -hwmon-adt7470-fix-warning-on-module-removal.patch-27037 kvm-x86-cpuid-only-provide-cpuid-leaf-0xa-if-host-ha.patch net-sched-prevent-uaf-on-tc_ctl_tfilter-when-temporarily-dropping-rtnl_lock.patch net-ipv6-ensure-we-call-ipv6_mc_down-at-most-once.patch diff --git a/queue-5.4/hwmon-adt7470-fix-warning-on-module-removal.patch-15216 b/queue-5.4/hwmon-adt7470-fix-warning-on-module-removal.patch-15216 deleted file mode 100644 index a76985ba626..00000000000 --- a/queue-5.4/hwmon-adt7470-fix-warning-on-module-removal.patch-15216 +++ /dev/null @@ -1,49 +0,0 @@ -From 4fdf6634d79999d99d828650e324f5a7fc705635 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 7 Apr 2022 12:13:12 +0200 -Subject: hwmon: (adt7470) Fix warning on module removal - -From: Armin Wolf - -[ Upstream commit 7b2666ce445c700b8dcee994da44ddcf050a0842 ] - -When removing the adt7470 module, a warning might be printed: - -do not call blocking ops when !TASK_RUNNING; state=1 -set at [] adt7470_update_thread+0x7b/0x130 [adt7470] - -This happens because adt7470_update_thread() can leave the kthread in -TASK_INTERRUPTIBLE state when the kthread is being stopped before -the call of set_current_state(). Since kthread_exit() might sleep in -exit_signals(), the warning is printed. -Fix that by using schedule_timeout_interruptible() and removing -the call of set_current_state(). -This causes TASK_INTERRUPTIBLE to be set after kthread_should_stop() -which might cause the kthread to exit. - -Reported-by: Zheyu Ma -Fixes: 93cacfd41f82 (hwmon: (adt7470) Allow faster removal) -Signed-off-by: Armin Wolf -Tested-by: Zheyu Ma -Link: https://lore.kernel.org/r/20220407101312.13331-1-W_Armin@gmx.de -Signed-off-by: Guenter Roeck -Signed-off-by: Sasha Levin ---- - drivers/hwmon/adt7470.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/hwmon/adt7470.c b/drivers/hwmon/adt7470.c -index 95e06886991d..1f82a0ee0397 100644 ---- a/drivers/hwmon/adt7470.c -+++ b/drivers/hwmon/adt7470.c -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.35.1 - diff --git a/queue-5.4/series b/queue-5.4/series index 28e71ded7cc..d086ad42e50 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -32,7 +32,6 @@ smsc911x-allow-using-irq0.patch btrfs-always-log-symlinks-in-full-mode.patch net-igmp-respect-rcu-rules-in-ip_mc_source-and-ip_mc_msfilter.patch drm-amdkfd-use-drm_priv-to-pass-vm-from-kfd-to-amdgpu.patch -hwmon-adt7470-fix-warning-on-module-removal.patch-15216 nfsv4-don-t-invalidate-inode-attributes-on-delegatio.patch kvm-x86-cpuid-only-provide-cpuid-leaf-0xa-if-host-ha.patch x86-kvm-preserve-bsp-msr_kvm_poll_control-across-sus.patch