summaryrefslogtreecommitdiffstats
path: root/patch-6.2-redhat.patch
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@fedoraproject.org>2022-12-26 10:31:20 -0600
committerJustin M. Forbes <jforbes@fedoraproject.org>2022-12-26 10:31:20 -0600
commit033e511447ba8abd5e93ec3c0e2c177139466843 (patch)
treeb43443b220acda2bd8bfc7a0e262eae0fdd71ff6 /patch-6.2-redhat.patch
parent15ce02cc96d0b0f36334bbd6370462fb90037b94 (diff)
downloadkernel-033e511447ba8abd5e93ec3c0e2c177139466843.tar.gz
kernel-033e511447ba8abd5e93ec3c0e2c177139466843.tar.xz
kernel-033e511447ba8abd5e93ec3c0e2c177139466843.zip
kernel-6.2.0-0.rc1.14
* Mon Dec 26 2022 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.2.0-0.rc1.14] - 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.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/patch-6.2-redhat.patch b/patch-6.2-redhat.patch
index bf29c9896..ba27174c3 100644
--- a/patch-6.2-redhat.patch
+++ b/patch-6.2-redhat.patch
@@ -121,7 +121,7 @@ index 000000000000..effb81d04bfd
+
+endmenu
diff --git a/Makefile b/Makefile
-index 25247f931872..f72f0ed52e78 100644
+index d4b6af8c09e9..8223bfdea30b 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
@@ -2547,7 +2547,7 @@ index 7e5c3ddc341d..850393c608ef 100644
default y
help
diff --git a/kernel/Makefile b/kernel/Makefile
-index e7fc37a68069..b91424eebd96 100644
+index 10ef068f598d..d7953f0ee28a 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -12,6 +12,7 @@ obj-y = fork.o exec_domain.o panic.o \
@@ -2650,10 +2650,10 @@ index a2ff4242e623..f0d2be1ee4f1 100644
int module_sig_check(struct load_info *info, int flags)
diff --git a/kernel/panic.c b/kernel/panic.c
-index 326d91505f04..44b01e472228 100644
+index 463c9295bc28..9f4d0cefeceb 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
-@@ -467,6 +467,19 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = {
+@@ -470,6 +470,19 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = {
[ TAINT_AUX ] = { 'X', ' ', true },
[ TAINT_RANDSTRUCT ] = { 'T', ' ', true },
[ TAINT_TEST ] = { 'N', ' ', true },