summaryrefslogtreecommitdiffstats
path: root/patch-6.2-redhat.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2022-12-30 08:12:55 -0600
committerJustin M. Forbes <jforbes@fedoraproject.org>2022-12-30 08:12:55 -0600
commit90ce4749d5a8f57865d69a1d04766619d6da5484 (patch)
treef7c8f105e5a9d92fa38f9794ac24046f954c7485 /patch-6.2-redhat.patch
parent033e511447ba8abd5e93ec3c0e2c177139466843 (diff)
downloadkernel-90ce4749d5a8f57865d69a1d04766619d6da5484.tar.gz
kernel-90ce4749d5a8f57865d69a1d04766619d6da5484.tar.xz
kernel-90ce4749d5a8f57865d69a1d04766619d6da5484.zip
kernel-6.2.0-0.rc1.20221230gitbff687b3dad6.15
* Fri Dec 30 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc1.bff687b3dad6.15] - Revert "redhat: fix elf got hardening for vm tools" (Don Zickus) - Revert "arm64: remove special treatment for the link order of head.o" (Justin M. Forbes) Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'patch-6.2-redhat.patch')
-rw-r--r--patch-6.2-redhat.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch
index ba27174c3..8f14182f4 100644
--- a/patch-6.2-redhat.patch
+++ b/patch-6.2-redhat.patch
@@ -1229,7 +1229,7 @@ index ee4da9ab8013..d395d11eadc4 100644
if (ret < 0)
goto err_allowedips;
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
-index 95c488ea91c3..fad3f16d463f 100644
+index 7be562a4e1aa..0169d9f5df9b 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -250,6 +250,9 @@ static void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl)
@@ -1343,7 +1343,7 @@ index c03093b6813c..46a71df1fbd1 100644
if (!ctrl->max_namespaces ||
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
-index 6bbb73ef8b25..1c99a8a525c9 100644
+index 424c8a467a0c..3230b91d3476 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -873,6 +873,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys);