drop queue-6.1/octeon_ep-cancel-ctrl_mbox_task-after-intr_poll_task.patch

DOes not fix an issue in 6.1, only 6.4

diff --git a/queue-6.1/octeon_ep-cancel-ctrl_mbox_task-after-intr_poll_task.patch b/queue-6.1/octeon_ep-cancel-ctrl_mbox_task-after-intr_poll_task.patch
deleted file mode 100644 (file)
index 360435a..0000000
--- a/queue-6.1/octeon_ep-cancel-ctrl_mbox_task-after-intr_poll_task.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 4b975d228cd7179852df4434fe6a1de32df11b2d Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 10 Aug 2023 17:01:13 +0200
-Subject: octeon_ep: cancel ctrl_mbox_task after intr_poll_task
-
-From: Michal Schmidt <mschmidt@redhat.com>
-
-[ Upstream commit 607a7a45cdf38c1901e0d81e4e00a2a88786330a ]
-
-intr_poll_task may queue ctrl_mbox_task. The function
-octep_poll_non_ioq_interrupts_cn93_pf does this.
-
-When removing the driver and canceling these two works, cancel
-ctrl_mbox_task last to guarantee it does not run anymore.
-
-Fixes: 24d4333233b3 ("octeon_ep: poll for control messages")
-Signed-off-by: Michal Schmidt <mschmidt@redhat.com>
-Link: https://lore.kernel.org/r/20230810150114.107765-4-mschmidt@redhat.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/ethernet/marvell/octeon_ep/octep_main.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
-index d4ec46d1c8cfb..2342c821fc9b0 100644
---- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
-+++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
-@@ -1121,12 +1121,12 @@ static void octep_remove(struct pci_dev *pdev)
-       if (!oct)
-               return;
- 
--      cancel_work_sync(&oct->ctrl_mbox_task);
-       netdev = oct->netdev;
-       if (netdev->reg_state == NETREG_REGISTERED)
-               unregister_netdev(netdev);
- 
-       cancel_work_sync(&oct->tx_timeout_task);
-+      cancel_work_sync(&oct->ctrl_mbox_task);
-       octep_device_cleanup(oct);
-       pci_release_mem_regions(pdev);
-       free_netdev(netdev);
--- 
-2.40.1
-

diff --git a/queue-6.1/series b/queue-6.1/series
index d98fad296d13b53dff6529937c630a79a647c6a8..a9e0476fd10ab36cb3d2aa328e80bd203f398e6f 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -117,7 +117,6 @@ selftests-mirror_gre_changes-tighten-up-the-ttl-test.patch
 drm-panel-simple-fix-auo-g121ean01-panel-timings-acc.patch
 net-macb-in-zynqmp-resume-always-configure-ps-gtr-fo.patch
 octeon_ep-cancel-tx_timeout_task-later-in-remove-seq.patch
-octeon_ep-cancel-ctrl_mbox_task-after-intr_poll_task.patch
 netfilter-nf_tables-fix-false-positive-lockdep-splat.patch
 netfilter-nf_tables-deactivate-catchall-elements-in-.patch
 ipvs-fix-racy-memcpy-in-proc_do_sync_threshold.patch