Drop the 687.5.3/687.5.4 security-ahead patches superseded by the RHEL 687.6.1..687.10.1 backports (1100-1104), and add those backports (1100-1196) sourced from centos-stream-9 and upstream stable. Keep the AlmaLinux-ahead smb cifs.spnego fix (retained as 1197). Bump to 5.14.0-687.10.1.
55 lines
2.3 KiB
Diff
55 lines
2.3 KiB
Diff
From 123d241dcfc31871e2610504c50583dce8ac832f Mon Sep 17 00:00:00 2001
|
|
From: Jan Stancek <jstancek@redhat.com>
|
|
Date: Tue, 23 Sep 2025 17:32:16 +0200
|
|
Subject: [PATCH] powerpc/tools: drop `-o pipefail` in gcc check scripts
|
|
|
|
JIRA: https://redhat.atlassian.net/browse/RHEL-165107
|
|
Upstream Status: linux.git
|
|
|
|
Conflicts:
|
|
- RHEL commit 12e313df71b6 ("powerpc/tools: drop `-o pipefail` in gcc check scripts")
|
|
applied one of the hunks of upstream commit, because at the time RHEL9
|
|
was missing gcc-check-fpatchable-function-entry.sh.
|
|
This has changed when RHEL commit
|
|
c3aeb790328d ("powerpc/ftrace: Add support for -fpatchable-function-entry")
|
|
introduced it.
|
|
This applies missing hunk from f1164534ad62f0cc247d99650b07bd59ad2a49fd to
|
|
arch/powerpc/tools/gcc-check-fpatchable-function-entry.sh
|
|
|
|
commit f1164534ad62f0cc247d99650b07bd59ad2a49fd
|
|
Author: Jan Stancek <jstancek@redhat.com>
|
|
Date: Tue Sep 23 17:32:16 2025 +0200
|
|
|
|
powerpc/tools: drop `-o pipefail` in gcc check scripts
|
|
|
|
Fixes: 0f71dcfb4aef ("powerpc/ftrace: Add support for -fpatchable-function-entry")
|
|
Fixes: b71c9ffb1405 ("powerpc: Add arch/powerpc/tools directory")
|
|
Reported-by: Joe Lawrence <joe.lawrence@redhat.com>
|
|
Acked-by: Joe Lawrence <joe.lawrence@redhat.com>
|
|
Signed-off-by: Jan Stancek <jstancek@redhat.com>
|
|
Fixes: 8c50b72a3b4f ("powerpc/ftrace: Add Kconfig & Make glue for mprofile-kernel")
|
|
Fixes: abba759796f9 ("powerpc/kbuild: move -mprofile-kernel check to Kconfig")
|
|
Tested-by: Justin M. Forbes <jforbes@fedoraproject.org>
|
|
Reviewed-by: Naveen N Rao (AMD) <naveen@kernel.org>
|
|
Reviewed-by: Josh Poimboeuf <jpoimboe@kernel.org>
|
|
Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com>
|
|
Link: https://patch.msgid.link/cc6cdd116c3ad9d990df21f13c6d8e8a83815bbd.1758641374.git.jstancek@redhat.com
|
|
|
|
Signed-off-by: Jan Stancek <jstancek@redhat.com>
|
|
|
|
diff --git a/arch/powerpc/tools/gcc-check-fpatchable-function-entry.sh b/arch/powerpc/tools/gcc-check-fpatchable-function-entry.sh
|
|
index 06706903503b..baed467a016b 100755
|
|
--- a/arch/powerpc/tools/gcc-check-fpatchable-function-entry.sh
|
|
+++ b/arch/powerpc/tools/gcc-check-fpatchable-function-entry.sh
|
|
@@ -2,7 +2,6 @@
|
|
# SPDX-License-Identifier: GPL-2.0
|
|
|
|
set -e
|
|
-set -o pipefail
|
|
|
|
# To debug, uncomment the following line
|
|
# set -x
|
|
--
|
|
2.50.1 (Apple Git-155)
|
|
|