drop duplicate 5.10 patch

diff --git a/queue-5.10/revert-wifi-cfg80211-stop-nan-and-p2p-in-cfg80211_leave.patch b/queue-5.10/revert-wifi-cfg80211-stop-nan-and-p2p-in-cfg80211_leave.patch
deleted file mode 100644 (file)
index bc99344..0000000
--- a/queue-5.10/revert-wifi-cfg80211-stop-nan-and-p2p-in-cfg80211_leave.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From regressions+bounces-16332-greg=kroah.com@lists.linux.dev Tue Apr 14 06:04:19 2026
-From: guocai.he.cn@windriver.com
-Date: Tue, 14 Apr 2026 12:03:49 +0800
-Subject: Revert "wifi: cfg80211: stop NAN and P2P in cfg80211_leave"
-To: gregkh@linuxfoundation.org
-Cc: stable@vger.kernel.org, johannes.berg@intel.com, netdev@vger.kernel.org, regressions@lists.linux.dev, miriam.rachel.korenblit@intel.com, linux-kernel@vger.kernel.org
-Message-ID: <20260414040349.2974854-1-guocai.he.cn@windriver.com>
-
-From: Guocai He <guocai.he.cn@windriver.com>
-
-This reverts commit d91240f24e831d3bd36954599ada6b456fb1bd0a which is commit
-e1696c8bd0056bc1a5f7766f58ac333adc203e8a upstream.
-
-The reverted patch introduced a deadlock. The locking situation in mainline is
-totally different, so it is incorrect to directly backport the commit from mainline.
-
-Signed-off-by: Guocai He <guocai.he.cn@windriver.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- net/wireless/core.c |    4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
---- a/net/wireless/core.c
-+++ b/net/wireless/core.c
-@@ -1119,10 +1119,8 @@ static void __cfg80211_unregister_wdev(s
- 
-       switch (wdev->iftype) {
-       case NL80211_IFTYPE_P2P_DEVICE:
--              cfg80211_stop_p2p_device(rdev, wdev);
--              break;
-       case NL80211_IFTYPE_NAN:
--              cfg80211_stop_nan(rdev, wdev);
-+              /* cannot happen, has no netdev */
-               break;
-       default:
-               break;

diff --git a/queue-5.10/series b/queue-5.10/series
index 16dfa1aa07f5c1c74203300a0035e542c7f4f4cb..3f7cfebf336e9dd450e26476a1f36c6f4a23c5a2 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -105,7 +105,6 @@ ocfs2-add-inline-inode-consistency-check-to-ocfs2_validate_inode_block.patch
 ocfs2-validate-inline-data-i_size-during-inode-read.patch
 ocfs2-fix-out-of-bounds-write-in-ocfs2_write_end_inline.patch
 rxrpc-reject-undecryptable-rxkad-response-tickets.patch
-revert-wifi-cfg80211-stop-nan-and-p2p-in-cfg80211_leave.patch
 blk-mq-use-quiesced-elevator-switch-when-reinitializing-queues.patch
 drivers-base-free-devm-resources-when-unregistering-a-device.patch
 x86-uprobes-fix-xol-allocation-failure-for-32-bit-tasks.patch