Drop nvme-pci-skip-nvme_write_sq_db-on-empty-rqlist.patch from older trees

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.1/nvme-pci-skip-nvme_write_sq_db-on-empty-rqlist.patch b/queue-6.1/nvme-pci-skip-nvme_write_sq_db-on-empty-rqlist.patch
deleted file mode 100644 (file)
index 0c9857f..0000000
--- a/queue-6.1/nvme-pci-skip-nvme_write_sq_db-on-empty-rqlist.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 89d6c9bb722126a52cdd65d61ca4bb2b51218b6d Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 31 Mar 2025 18:28:59 +0200
-Subject: nvme-pci: skip nvme_write_sq_db on empty rqlist
-
-From: Maurizio Lombardi <mlombard@redhat.com>
-
-[ Upstream commit 288ff0d10beb069355036355d5f7612579dc869c ]
-
-nvme_submit_cmds() should check the rqlist before calling
-nvme_write_sq_db(); if the list is empty, it must return immediately.
-
-Fixes: beadf0088501 ("nvme-pci: reverse request order in nvme_queue_rqs")
-Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
-Signed-off-by: Keith Busch <kbusch@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/nvme/host/pci.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
-index da858463b2557..c62ff639a39bd 100644
---- a/drivers/nvme/host/pci.c
-+++ b/drivers/nvme/host/pci.c
-@@ -954,6 +954,9 @@ static void nvme_submit_cmds(struct nvme_queue *nvmeq, struct request **rqlist)
- {
-       struct request *req;
- 
-+      if (rq_list_empty(rqlist))
-+              return;
-+
-       spin_lock(&nvmeq->sq_lock);
-       while ((req = rq_list_pop(rqlist))) {
-               struct nvme_iod *iod = blk_mq_rq_to_pdu(req);
--- 
-2.39.5
-

diff --git a/queue-6.1/series b/queue-6.1/series
index 056f4db85ac5f93fd9fa6c2765e5be98d7ece260..61e0f62150d84a48f905d25357b26925af789fc6 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -151,7 +151,6 @@ spufs-fix-a-leak-in-spufs_create_context.patch
 riscv-ftrace-add-parentheses-in-macro-definitions-of.patch
 ntb_hw_switchtec-fix-shift-out-of-bounds-in-switchte.patch
 ntb-intel-fix-using-link-status-db-s.patch
-nvme-pci-skip-nvme_write_sq_db-on-empty-rqlist.patch
 asoc-imx-card-add-null-check-in-imx_card_probe.patch
 netfilter-nft_set_hash-gc-reaps-elements-with-connco.patch
 netlabel-fix-null-pointer-exception-caused-by-calips.patch

diff --git a/queue-6.12/nvme-pci-skip-nvme_write_sq_db-on-empty-rqlist.patch b/queue-6.12/nvme-pci-skip-nvme_write_sq_db-on-empty-rqlist.patch
deleted file mode 100644 (file)
index 1971a99..0000000
--- a/queue-6.12/nvme-pci-skip-nvme_write_sq_db-on-empty-rqlist.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From cec423a355e8f7357084807e1a244e9994735737 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 31 Mar 2025 18:28:59 +0200
-Subject: nvme-pci: skip nvme_write_sq_db on empty rqlist
-
-From: Maurizio Lombardi <mlombard@redhat.com>
-
-[ Upstream commit 288ff0d10beb069355036355d5f7612579dc869c ]
-
-nvme_submit_cmds() should check the rqlist before calling
-nvme_write_sq_db(); if the list is empty, it must return immediately.
-
-Fixes: beadf0088501 ("nvme-pci: reverse request order in nvme_queue_rqs")
-Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
-Signed-off-by: Keith Busch <kbusch@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/nvme/host/pci.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
-index af45a1b865ee1..4fdcf146cbaad 100644
---- a/drivers/nvme/host/pci.c
-+++ b/drivers/nvme/host/pci.c
-@@ -989,6 +989,9 @@ static void nvme_submit_cmds(struct nvme_queue *nvmeq, struct request **rqlist)
- {
-       struct request *req;
- 
-+      if (rq_list_empty(rqlist))
-+              return;
-+
-       spin_lock(&nvmeq->sq_lock);
-       while ((req = rq_list_pop(rqlist))) {
-               struct nvme_iod *iod = blk_mq_rq_to_pdu(req);
--- 
-2.39.5
-

diff --git a/queue-6.12/series b/queue-6.12/series
index dac3bea9fa3ae50d0ccc388658818093ec7fc62e..db22a24bb89a04054fd1c59876a4cd79bbc9198b 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -317,7 +317,6 @@ riscv-fix-hugetlb-retrieval-of-number-of-ptes-in-cas.patch
 riscv-kexec_file-handle-r_riscv_64-in-purgatory-relo.patch
 riscv-purgatory-4b-align-purgatory_start.patch
 nvme-ioctl-don-t-warn-on-vectorized-uring_cmd-with-f.patch
-nvme-pci-skip-nvme_write_sq_db-on-empty-rqlist.patch
 asoc-imx-card-add-null-check-in-imx_card_probe.patch
 spi-bcm2835-do-not-call-gpiod_put-on-invalid-descrip.patch
 alsa-hda-realtek-fix-built-in-mic-on-another-asus-vi.patch

diff --git a/queue-6.6/nvme-pci-skip-nvme_write_sq_db-on-empty-rqlist.patch b/queue-6.6/nvme-pci-skip-nvme_write_sq_db-on-empty-rqlist.patch
deleted file mode 100644 (file)
index 940469a..0000000
--- a/queue-6.6/nvme-pci-skip-nvme_write_sq_db-on-empty-rqlist.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 71596fc7761351e1485a701d907fb61bd1f2b31a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 31 Mar 2025 18:28:59 +0200
-Subject: nvme-pci: skip nvme_write_sq_db on empty rqlist
-
-From: Maurizio Lombardi <mlombard@redhat.com>
-
-[ Upstream commit 288ff0d10beb069355036355d5f7612579dc869c ]
-
-nvme_submit_cmds() should check the rqlist before calling
-nvme_write_sq_db(); if the list is empty, it must return immediately.
-
-Fixes: beadf0088501 ("nvme-pci: reverse request order in nvme_queue_rqs")
-Signed-off-by: Maurizio Lombardi <mlombard@redhat.com>
-Signed-off-by: Keith Busch <kbusch@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/nvme/host/pci.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
-index a763df0200ab4..ede3be06143fb 100644
---- a/drivers/nvme/host/pci.c
-+++ b/drivers/nvme/host/pci.c
-@@ -907,6 +907,9 @@ static void nvme_submit_cmds(struct nvme_queue *nvmeq, struct request **rqlist)
- {
-       struct request *req;
- 
-+      if (rq_list_empty(rqlist))
-+              return;
-+
-       spin_lock(&nvmeq->sq_lock);
-       while ((req = rq_list_pop(rqlist))) {
-               struct nvme_iod *iod = blk_mq_rq_to_pdu(req);
--- 
-2.39.5
-

diff --git a/queue-6.6/series b/queue-6.6/series
index 13b4ed7ba6acc878d8894bd92d99f99c900f7a11..0aee58230c9f846f9761ab133d3db95027fcf1d5 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -200,7 +200,6 @@ risc-v-errata-use-medany-for-relocatable-builds.patch
 x86-uaccess-improve-performance-by-aligning-writes-t.patch
 asoc-codecs-rt5665-fix-some-error-handling-paths-in-.patch
 riscv-fix-hugetlb-retrieval-of-number-of-ptes-in-cas.patch
-nvme-pci-skip-nvme_write_sq_db-on-empty-rqlist.patch
 asoc-imx-card-add-null-check-in-imx_card_probe.patch
 e1000e-change-k1-configuration-on-mtp-and-later-plat.patch
 netfilter-nft_set_hash-gc-reaps-elements-with-connco.patch