summaryrefslogtreecommitdiffstats
path: root/patch-6.2-redhat.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2023-01-30 10:11:50 -0600
committerJustin M. Forbes <jforbes@fedoraproject.org>2023-01-30 10:11:50 -0600
commitb19a5698c95c95f50ea96f25805ee95c5b32ded7 (patch)
treef35ac914e68150baca7e3067ec93e1b7ab5d307c /patch-6.2-redhat.patch
parent2386c4e82f76f097a74bb2a885ac9021fca0cdde (diff)
downloadkernel-b19a5698c95c95f50ea96f25805ee95c5b32ded7.tar.gz
kernel-b19a5698c95c95f50ea96f25805ee95c5b32ded7.tar.xz
kernel-b19a5698c95c95f50ea96f25805ee95c5b32ded7.zip
kernel-6.2.0-0.rc6.44
* Mon Jan 30 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc6.44] - Update self-test data to not expect debugbuildsenabled 0 (Justin M. Forbes) - Turn off forced debug builds (Justin M. Forbes) - Turn on debug builds for aarch64 Fedora (Justin M. Forbes) - Revert "redhat: fix elf got hardening for vm tools" (Don Zickus) 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 0b3e296a3..67b55afd6 100644
--- a/patch-6.2-redhat.patch
+++ b/patch-6.2-redhat.patch
@@ -120,7 +120,7 @@ index 000000000000..effb81d04bfd
+
+endmenu
diff --git a/Makefile b/Makefile
-index c1ead4cd2342..eecdc6ae5d6e 100644
+index 749bb455546e..d460f5a0eb93 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -1228,7 +1228,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 7be562a4e1aa..0169d9f5df9b 100644
+index 505e16f20e57..f59344f98b1e 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)