From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 10 May 2022 12:48:15 +0000 (+0200)
Subject: drop hwmon-adt7470-fix-warning-on-module-removal.patch-3384 from 5.10
X-Git-Tag: v4.9.313~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da7f018466cf8e0055aa0122accb901a0235649a;p=thirdparty%2Fkernel%2Fstable-queue.git

drop hwmon-adt7470-fix-warning-on-module-removal.patch-3384 from 5.10

It was a duplicate.
---

diff --git a/queue-5.10/hwmon-adt7470-fix-warning-on-module-removal.patch-3384 b/queue-5.10/hwmon-adt7470-fix-warning-on-module-removal.patch-3384
deleted file mode 100644
index 99b4b1c4e1a..00000000000
--- a/queue-5.10/hwmon-adt7470-fix-warning-on-module-removal.patch-3384
+++ /dev/null
@@ -1,49 +0,0 @@
-From 4d6488d25de932587ef80b4a3cb1d6ddbbd89a79 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 7 Apr 2022 12:13:12 +0200
-Subject: hwmon: (adt7470) Fix warning on module removal
-
-From: Armin Wolf <W_Armin@gmx.de>
-
-[ 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 [<ffffffffa006052b>] 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 <zheyuma97@gmail.com>
-Fixes: 93cacfd41f82 (hwmon: (adt7470) Allow faster removal)
-Signed-off-by: Armin Wolf <W_Armin@gmx.de>
-Tested-by: Zheyu Ma <zheyuma97@gmail.com>
-Link: https://lore.kernel.org/r/20220407101312.13331-1-W_Armin@gmx.de
-Signed-off-by: Guenter Roeck <linux@roeck-us.net>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/hwmon/adt7470.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/drivers/hwmon/adt7470.c b/drivers/hwmon/adt7470.c
-index 71e357956ce4..8028af4e4645 100644
---- a/drivers/hwmon/adt7470.c
-+++ b/drivers/hwmon/adt7470.c
-@@ -18,6 +18,7 @@
- #include <linux/delay.h>
- #include <linux/log2.h>
- #include <linux/kthread.h>
-+#include <linux/sched.h>
- #include <linux/slab.h>
- #include <linux/util_macros.h>
- #include <linux/sched.h>
--- 
-2.35.1
-
diff --git a/queue-5.10/series b/queue-5.10/series
index 53795b4d0c9..73d10a6de64 100644
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -55,7 +55,6 @@ selftests-ocelot-tc_flower_chains-specify-conform-exceed-action-for-policer.patc
 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-3384
 kvm-x86-cpuid-only-provide-cpuid-leaf-0xa-if-host-ha.patch
 net-mlx5-fix-slab-out-of-bounds-while-reading-resour.patch
 x86-kvm-preserve-bsp-msr_kvm_poll_control-across-sus.patch