From: Greg Kroah-Hartman Date: Tue, 21 Feb 2023 09:12:42 +0000 (+0100) Subject: drop nvme-apple-fix-controller-shutdown-in-apple_nvme_dis.patch from 6.1 X-Git-Tag: v4.14.306~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63437716681b28c004d2130a132f7756e8a3f926;p=thirdparty%2Fkernel%2Fstable-queue.git drop nvme-apple-fix-controller-shutdown-in-apple_nvme_dis.patch from 6.1 --- diff --git a/queue-6.1/nvme-apple-fix-controller-shutdown-in-apple_nvme_dis.patch b/queue-6.1/nvme-apple-fix-controller-shutdown-in-apple_nvme_dis.patch deleted file mode 100644 index d9d54849345..00000000000 --- a/queue-6.1/nvme-apple-fix-controller-shutdown-in-apple_nvme_dis.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 1611eb1747c6a533f1bce6d21d6323f9c5409514 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 8 Nov 2022 11:14:09 +0100 -Subject: nvme-apple: fix controller shutdown in apple_nvme_disable - -From: Christoph Hellwig - -[ Upstream commit c76b8308e4c9148e44e0c7e086ab6d8b4bb10162 ] - -nvme_shutdown_ctrl already shuts the controller down, there is no -need to also call nvme_disable_ctrl for the shutdown case. - -Signed-off-by: Christoph Hellwig -Reviewed-by: Keith Busch -Reviewed-by: Eric Curtin -Reviewed-by: Sagi Grimberg -Reviewed-by: Hector Martin -Signed-off-by: Sasha Levin ---- - drivers/nvme/host/apple.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/nvme/host/apple.c b/drivers/nvme/host/apple.c -index 262d2b60ac6dd..92c70c4b2f6ec 100644 ---- a/drivers/nvme/host/apple.c -+++ b/drivers/nvme/host/apple.c -@@ -831,7 +831,8 @@ static void apple_nvme_disable(struct apple_nvme *anv, bool shutdown) - - if (shutdown) - nvme_shutdown_ctrl(&anv->ctrl); -- nvme_disable_ctrl(&anv->ctrl); -+ else -+ nvme_disable_ctrl(&anv->ctrl); - } - - WRITE_ONCE(anv->ioq.enabled, false); --- -2.39.0 - diff --git a/queue-6.1/series b/queue-6.1/series index e1acdfed439..46d8006f4fc 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -108,7 +108,6 @@ i40e-add-checking-for-null-for-nlmsg_find_attr.patch net-sched-tcindex-search-key-must-be-16-bits.patch nvme-tcp-stop-auth-work-after-tearing-down-queues-in.patch nvme-rdma-stop-auth-work-after-tearing-down-queues-i.patch -nvme-apple-fix-controller-shutdown-in-apple_nvme_dis.patch kvm-x86-pmu-disable-vpmu-support-on-hybrid-cpus-host-pmus.patch kvm-initialize-all-of-the-kvm_debugregs-structure-before-sending-it-to-userspace.patch perf-x86-refuse-to-export-capabilities-for-hybrid-pmus.patch