drop 1 patch from queue-5.15 and queue-5.10 based on RC review feedback

Dropped patches:

- "wifi: cw1200: Fix locking in error paths"
  Queues: 5.15, 5.10
  Reason: patch author and reviewer confirm this introduces a double-unlock bug;
          error paths already call cw1200_wow_resume() which unlocks conf_mutex
  Report: https://lore.kernel.org/stable/408661f69f263266b028713e1412ba36d457e63d.camel@decadent.org.uk/

diff --git a/queue-5.10/series b/queue-5.10/series
index f4314592cceba093a4957237df337bf6486cf6b2..435427e0156fc559867f9185b07195b3782b7135 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -35,7 +35,6 @@ net-ethernet-ti-am65-cpsw-nuss-cpsw-ale-fix-multicas.patch
 atm-lec-fix-null-ptr-deref-in-lec_arp_clear_vccs.patch
 can-bcm-fix-locking-for-bcm_op-runtime-updates.patch
 can-mcp251x-fix-deadlock-in-error-path-of-mcp251x_op.patch
-wifi-cw1200-fix-locking-in-error-paths.patch
 wifi-wlcore-fix-a-locking-bug.patch
 indirect_call_wrapper-do-not-reevaluate-function-poi.patch
 xen-acpi-processor-fix-_cst-detection-using-undersiz.patch

diff --git a/queue-5.10/wifi-cw1200-fix-locking-in-error-paths.patch b/queue-5.10/wifi-cw1200-fix-locking-in-error-paths.patch
deleted file mode 100644 (file)
index 49eb16a..0000000
--- a/queue-5.10/wifi-cw1200-fix-locking-in-error-paths.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 3bbf53933b54e7753cea3fbceb19c7c00ee8bf9b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 23 Feb 2026 14:00:24 -0800
-Subject: wifi: cw1200: Fix locking in error paths
-
-From: Bart Van Assche <bvanassche@acm.org>
-
-[ Upstream commit d98c24617a831e92e7224a07dcaed2dd0b02af96 ]
-
-cw1200_wow_suspend() must only return with priv->conf_mutex locked if it
-returns zero. This mutex must be unlocked if an error is returned. Add
-mutex_unlock() calls to the error paths from which that call is missing.
-This has been detected by the Clang thread-safety analyzer.
-
-Fixes: a910e4a94f69 ("cw1200: add driver for the ST-E CW1100 & CW1200 WLAN chipsets")
-Signed-off-by: Bart Van Assche <bvanassche@acm.org>
-Link: https://patch.msgid.link/20260223220102.2158611-25-bart.vanassche@linux.dev
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/wireless/st/cw1200/pm.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/net/wireless/st/cw1200/pm.c b/drivers/net/wireless/st/cw1200/pm.c
-index a20ab577a3644..212b6f2af8de4 100644
---- a/drivers/net/wireless/st/cw1200/pm.c
-+++ b/drivers/net/wireless/st/cw1200/pm.c
-@@ -264,12 +264,14 @@ int cw1200_wow_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
-               wiphy_err(priv->hw->wiphy,
-                         "PM request failed: %d. WoW is disabled.\n", ret);
-               cw1200_wow_resume(hw);
-+              mutex_unlock(&priv->conf_mutex);
-               return -EBUSY;
-       }
- 
-       /* Force resume if event is coming from the device. */
-       if (atomic_read(&priv->bh_rx)) {
-               cw1200_wow_resume(hw);
-+              mutex_unlock(&priv->conf_mutex);
-               return -EAGAIN;
-       }
- 
--- 
-2.51.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index b2724a344e357355eb68e27c16cf9f7613729573..38f2689f05e66168a661be00cce337f02ee12935 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -67,7 +67,6 @@ dpaa2-switch-fix-interrupt-storm-after-receiving-bad.patch
 atm-lec-fix-null-ptr-deref-in-lec_arp_clear_vccs.patch
 can-bcm-fix-locking-for-bcm_op-runtime-updates.patch
 can-mcp251x-fix-deadlock-in-error-path-of-mcp251x_op.patch
-wifi-cw1200-fix-locking-in-error-paths.patch
 wifi-wlcore-fix-a-locking-bug.patch
 indirect_call_wrapper-do-not-reevaluate-function-poi.patch
 xen-acpi-processor-fix-_cst-detection-using-undersiz.patch

diff --git a/queue-5.15/wifi-cw1200-fix-locking-in-error-paths.patch b/queue-5.15/wifi-cw1200-fix-locking-in-error-paths.patch
deleted file mode 100644 (file)
index 68187c2..0000000
--- a/queue-5.15/wifi-cw1200-fix-locking-in-error-paths.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 6f3d390b3e6d38824ba9ff190714766af6d2050b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 23 Feb 2026 14:00:24 -0800
-Subject: wifi: cw1200: Fix locking in error paths
-
-From: Bart Van Assche <bvanassche@acm.org>
-
-[ Upstream commit d98c24617a831e92e7224a07dcaed2dd0b02af96 ]
-
-cw1200_wow_suspend() must only return with priv->conf_mutex locked if it
-returns zero. This mutex must be unlocked if an error is returned. Add
-mutex_unlock() calls to the error paths from which that call is missing.
-This has been detected by the Clang thread-safety analyzer.
-
-Fixes: a910e4a94f69 ("cw1200: add driver for the ST-E CW1100 & CW1200 WLAN chipsets")
-Signed-off-by: Bart Van Assche <bvanassche@acm.org>
-Link: https://patch.msgid.link/20260223220102.2158611-25-bart.vanassche@linux.dev
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/wireless/st/cw1200/pm.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/net/wireless/st/cw1200/pm.c b/drivers/net/wireless/st/cw1200/pm.c
-index a20ab577a3644..212b6f2af8de4 100644
---- a/drivers/net/wireless/st/cw1200/pm.c
-+++ b/drivers/net/wireless/st/cw1200/pm.c
-@@ -264,12 +264,14 @@ int cw1200_wow_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
-               wiphy_err(priv->hw->wiphy,
-                         "PM request failed: %d. WoW is disabled.\n", ret);
-               cw1200_wow_resume(hw);
-+              mutex_unlock(&priv->conf_mutex);
-               return -EBUSY;
-       }
- 
-       /* Force resume if event is coming from the device. */
-       if (atomic_read(&priv->bh_rx)) {
-               cw1200_wow_resume(hw);
-+              mutex_unlock(&priv->conf_mutex);
-               return -EAGAIN;
-       }
- 
--- 
-2.51.0
-