diff --git a/Patchlist.changelog b/Patchlist.changelog index 24075d5fa..7d9a888ef 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,6 +1,3 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/94e0049d5645c2d7e63e65330b48210750e7fd5c - 94e0049d5645c2d7e63e65330b48210750e7fd5c powerpc: temporary assembler fix - https://gitlab.com/cki-project/kernel-ark/-/commit/e17bc3ed0c14face0de1eea5553a7786538e9ce6 e17bc3ed0c14face0de1eea5553a7786538e9ce6 redhat: fix bad merge diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index a7f520eb6..f6670f5dd 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -6279,6 +6279,7 @@ CONFIG_PREEMPT_DYNAMIC=y # CONFIG_PREEMPTIRQ_DELAY_TEST is not set # CONFIG_PREEMPT is not set # CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_RT is not set # CONFIG_PREEMPT_TRACER is not set CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PRESTERA=m diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index 16ba0f8e1..95c815625 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -6252,6 +6252,7 @@ CONFIG_PREEMPT_DYNAMIC=y # CONFIG_PREEMPTIRQ_DELAY_TEST is not set # CONFIG_PREEMPT is not set # CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_RT is not set # CONFIG_PREEMPT_TRACER is not set CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PRESTERA=m diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index cff56f187..b49afadf1 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -5111,6 +5111,7 @@ CONFIG_PREEMPT_DYNAMIC=y # CONFIG_PREEMPT is not set # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_NOTIFIERS=y +# CONFIG_PREEMPT_RT is not set # CONFIG_PREEMPT_TRACER is not set CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PRESTERA is not set diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index ab1cd58cc..bba435bd0 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -5088,6 +5088,7 @@ CONFIG_PREEMPT_DYNAMIC=y # CONFIG_PREEMPT is not set # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_NOTIFIERS=y +# CONFIG_PREEMPT_RT is not set # CONFIG_PREEMPT_TRACER is not set CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PRESTERA is not set diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 2ba4dd91a..21512c0e7 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -6278,6 +6278,7 @@ CONFIG_PREEMPT_DYNAMIC=y # CONFIG_PREEMPTIRQ_DELAY_TEST is not set # CONFIG_PREEMPT is not set # CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_RT is not set # CONFIG_PREEMPT_TRACER is not set CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PRESTERA=m diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 586dc01b5..83a644e8d 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -5107,6 +5107,7 @@ CONFIG_PREEMPT_DYNAMIC=y # CONFIG_PREEMPT is not set # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_NOTIFIERS=y +# CONFIG_PREEMPT_RT is not set # CONFIG_PREEMPT_TRACER is not set CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PRESTERA is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 2b5c3d43d..21c5010c9 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -6251,6 +6251,7 @@ CONFIG_PREEMPT_DYNAMIC=y # CONFIG_PREEMPTIRQ_DELAY_TEST is not set # CONFIG_PREEMPT is not set # CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_RT is not set # CONFIG_PREEMPT_TRACER is not set CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PRESTERA=m diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 655aa2fcd..5343263ee 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -5084,6 +5084,7 @@ CONFIG_PREEMPT_DYNAMIC=y # CONFIG_PREEMPT is not set # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_NOTIFIERS=y +# CONFIG_PREEMPT_RT is not set # CONFIG_PREEMPT_TRACER is not set CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PRESTERA is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 6ad9c5c87..82a465d90 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -5150,6 +5150,7 @@ CONFIG_PREEMPT_DYNAMIC=y # CONFIG_PREEMPTIRQ_DELAY_TEST is not set # CONFIG_PREEMPT is not set # CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_RT is not set # CONFIG_PREEMPT_TRACER is not set CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PRESTERA=m diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 74b56267c..b9b85e28b 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -4706,6 +4706,7 @@ CONFIG_PREEMPT_DYNAMIC=y # CONFIG_PREEMPT is not set # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_NOTIFIERS=y +# CONFIG_PREEMPT_RT is not set # CONFIG_PREEMPT_TRACER is not set CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PRESTERA is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index 958b4f75f..96d14f51e 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -5121,6 +5121,7 @@ CONFIG_PREEMPT_DYNAMIC=y # CONFIG_PREEMPTIRQ_DELAY_TEST is not set # CONFIG_PREEMPT is not set # CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_RT is not set # CONFIG_PREEMPT_TRACER is not set CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PRESTERA=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 8fbe2746b..cd5fd0a94 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -4685,6 +4685,7 @@ CONFIG_PREEMPT_DYNAMIC=y # CONFIG_PREEMPT is not set # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_NOTIFIERS=y +# CONFIG_PREEMPT_RT is not set # CONFIG_PREEMPT_TRACER is not set CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PRESTERA is not set diff --git a/kernel-riscv64-debug-fedora.config b/kernel-riscv64-debug-fedora.config index 3e097a30e..9d8a0be2f 100644 --- a/kernel-riscv64-debug-fedora.config +++ b/kernel-riscv64-debug-fedora.config @@ -5149,6 +5149,7 @@ CONFIG_PREEMPT_DYNAMIC=y # CONFIG_PREEMPTIRQ_DELAY_TEST is not set # CONFIG_PREEMPT is not set # CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_RT is not set # CONFIG_PREEMPT_TRACER is not set CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PRESTERA=m diff --git a/kernel-riscv64-fedora.config b/kernel-riscv64-fedora.config index a21b53b07..3f8acfe42 100644 --- a/kernel-riscv64-fedora.config +++ b/kernel-riscv64-fedora.config @@ -5120,6 +5120,7 @@ CONFIG_PREEMPT_DYNAMIC=y # CONFIG_PREEMPTIRQ_DELAY_TEST is not set # CONFIG_PREEMPT is not set # CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_RT is not set # CONFIG_PREEMPT_TRACER is not set CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PRESTERA=m diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index f87c3f231..79a4f9365 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -5067,6 +5067,7 @@ CONFIG_PPTP=m # CONFIG_PREEMPTIRQ_DELAY_TEST is not set # CONFIG_PREEMPT is not set # CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_RT is not set # CONFIG_PREEMPT_TRACER is not set CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PRESTERA=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 3bcbfc1ea..875ad2708 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -4639,6 +4639,7 @@ CONFIG_PPTP=m # CONFIG_PREEMPT is not set CONFIG_PREEMPT_NONE=y CONFIG_PREEMPT_NOTIFIERS=y +# CONFIG_PREEMPT_RT is not set # CONFIG_PREEMPT_TRACER is not set # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PRESTERA is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 1a2331da8..b9e64dfa4 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -5038,6 +5038,7 @@ CONFIG_PPTP=m # CONFIG_PREEMPTIRQ_DELAY_TEST is not set # CONFIG_PREEMPT is not set # CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_RT is not set # CONFIG_PREEMPT_TRACER is not set CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PRESTERA=m diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 72d07e7f3..95adff406 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -4618,6 +4618,7 @@ CONFIG_PPTP=m # CONFIG_PREEMPT is not set CONFIG_PREEMPT_NONE=y CONFIG_PREEMPT_NOTIFIERS=y +# CONFIG_PREEMPT_RT is not set # CONFIG_PREEMPT_TRACER is not set # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PRESTERA is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 3a3bda762..aa519d5d0 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -4629,6 +4629,7 @@ CONFIG_PPTP=m # CONFIG_PREEMPT is not set CONFIG_PREEMPT_NONE=y CONFIG_PREEMPT_NOTIFIERS=y +# CONFIG_PREEMPT_RT is not set # CONFIG_PREEMPT_TRACER is not set # CONFIG_PREEMPT_VOLUNTARY is not set # CONFIG_PRESTERA is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 428ae1b37..fb5d3157a 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -5562,6 +5562,7 @@ CONFIG_PREEMPT_DYNAMIC=y # CONFIG_PREEMPTIRQ_DELAY_TEST is not set # CONFIG_PREEMPT is not set # CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_RT is not set # CONFIG_PREEMPT_TRACER is not set CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PRESTERA=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 1e2bb27d1..768cd6011 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -4927,6 +4927,7 @@ CONFIG_PREEMPT_DYNAMIC=y # CONFIG_PREEMPT is not set # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_NOTIFIERS=y +# CONFIG_PREEMPT_RT is not set # CONFIG_PREEMPT_TRACER is not set CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PRESTERA is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 814693634..77b5a5e29 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -5534,6 +5534,7 @@ CONFIG_PREEMPT_DYNAMIC=y # CONFIG_PREEMPTIRQ_DELAY_TEST is not set # CONFIG_PREEMPT is not set # CONFIG_PREEMPT_NONE is not set +# CONFIG_PREEMPT_RT is not set # CONFIG_PREEMPT_TRACER is not set CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PRESTERA=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 448e1cca3..328eb3688 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -4905,6 +4905,7 @@ CONFIG_PREEMPT_DYNAMIC=y # CONFIG_PREEMPT is not set # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_NOTIFIERS=y +# CONFIG_PREEMPT_RT is not set # CONFIG_PREEMPT_TRACER is not set CONFIG_PREEMPT_VOLUNTARY=y # CONFIG_PRESTERA is not set diff --git a/kernel.changelog b/kernel.changelog index 41c2480be..522c886cc 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,6 +1,6 @@ -* Thu Sep 19 2024 Fedora Kernel Team [6.12.0-0.rc0.839c4f596f89.7] -- kernel.spec.template: add CC0-1.0 to License field (Patrick Talbert) -- powerpc: temporary assembler fix (Patrick Talbert) +* Fri Sep 20 2024 Fedora Kernel Team [6.12.0-0.rc0.baeb9a7d8b60.7] +- redhat: change schedule jobs image from cki-tools to builder-rawhide (Patrick Talbert) +- Linux v6.12.0-0.rc0.baeb9a7d8b60 Resolves: * Thu Sep 19 2024 Fedora Kernel Team [6.12.0-0.rc0.839c4f596f89.6] diff --git a/kernel.spec b/kernel.spec index 479e7468b..5a454f327 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.12.0 %define specversion 6.12.0 %define patchversion 6.12 -%define pkgrelease 0.rc0.20240919git839c4f596f89.7 +%define pkgrelease 0.rc0.20240920gitbaeb9a7d8b60.7 %define kversion 6 -%define tarfile_release 6.11-7262-g839c4f596f89 +%define tarfile_release 6.11-7341-gbaeb9a7d8b60 # This is needed to do merge window version magic %define patchlevel 12 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20240919git839c4f596f89.7%{?buildid}%{?dist} +%define specrelease 0.rc0.20240920gitbaeb9a7d8b60.7%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.12.0 @@ -648,7 +648,7 @@ Summary: The Linux kernel Name: %{package_name} -License: ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-2-Clause) AND ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-3-Clause) AND ((GPL-2.0-only WITH Linux-syscall-note) OR CDDL-1.0) AND ((GPL-2.0-only WITH Linux-syscall-note) OR Linux-OpenIB) AND ((GPL-2.0-only WITH Linux-syscall-note) OR MIT) AND ((GPL-2.0-or-later WITH Linux-syscall-note) OR BSD-3-Clause) AND ((GPL-2.0-or-later WITH Linux-syscall-note) OR MIT) AND BSD-2-Clause AND (BSD-2-Clause OR Apache-2.0) AND BSD-3-Clause AND BSD-3-Clause-Clear AND GFDL-1.1-no-invariants-or-later AND GPL-1.0-or-later AND (GPL-1.0-or-later OR BSD-3-Clause) AND (GPL-1.0-or-later WITH Linux-syscall-note) AND GPL-2.0-only AND (GPL-2.0-only OR Apache-2.0) AND (GPL-2.0-only OR BSD-2-Clause) AND (GPL-2.0-only OR BSD-3-Clause) AND (GPL-2.0-only OR CDDL-1.0) AND (GPL-2.0-only OR GFDL-1.1-no-invariants-or-later) AND (GPL-2.0-only OR GFDL-1.2-no-invariants-only) AND (GPL-2.0-only WITH Linux-syscall-note) AND GPL-2.0-or-later AND (GPL-2.0-or-later OR BSD-2-Clause) AND (GPL-2.0-or-later OR BSD-3-Clause) AND (GPL-2.0-or-later OR CC-BY-4.0) AND (GPL-2.0-or-later WITH GCC-exception-2.0) AND (GPL-2.0-or-later WITH Linux-syscall-note) AND ISC AND LGPL-2.0-or-later AND (LGPL-2.0-or-later OR BSD-2-Clause) AND (LGPL-2.0-or-later WITH Linux-syscall-note) AND LGPL-2.1-only AND (LGPL-2.1-only OR BSD-2-Clause) AND (LGPL-2.1-only WITH Linux-syscall-note) AND LGPL-2.1-or-later AND (LGPL-2.1-or-later WITH Linux-syscall-note) AND (Linux-OpenIB OR GPL-2.0-only) AND (Linux-OpenIB OR GPL-2.0-only OR BSD-2-Clause) AND Linux-man-pages-copyleft AND MIT AND (MIT OR Apache-2.0) AND (MIT OR GPL-2.0-only) AND (MIT OR GPL-2.0-or-later) AND (MIT OR LGPL-2.1-only) AND (MPL-1.1 OR GPL-2.0-only) AND (X11 OR GPL-2.0-only) AND (X11 OR GPL-2.0-or-later) AND Zlib AND (copyleft-next-0.3.1 OR GPL-2.0-or-later) AND CC0-1.0 +License: ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-2-Clause) AND ((GPL-2.0-only WITH Linux-syscall-note) OR BSD-3-Clause) AND ((GPL-2.0-only WITH Linux-syscall-note) OR CDDL-1.0) AND ((GPL-2.0-only WITH Linux-syscall-note) OR Linux-OpenIB) AND ((GPL-2.0-only WITH Linux-syscall-note) OR MIT) AND ((GPL-2.0-or-later WITH Linux-syscall-note) OR BSD-3-Clause) AND ((GPL-2.0-or-later WITH Linux-syscall-note) OR MIT) AND BSD-2-Clause AND (BSD-2-Clause OR Apache-2.0) AND BSD-3-Clause AND BSD-3-Clause-Clear AND GFDL-1.1-no-invariants-or-later AND GPL-1.0-or-later AND (GPL-1.0-or-later OR BSD-3-Clause) AND (GPL-1.0-or-later WITH Linux-syscall-note) AND GPL-2.0-only AND (GPL-2.0-only OR Apache-2.0) AND (GPL-2.0-only OR BSD-2-Clause) AND (GPL-2.0-only OR BSD-3-Clause) AND (GPL-2.0-only OR CDDL-1.0) AND (GPL-2.0-only OR GFDL-1.1-no-invariants-or-later) AND (GPL-2.0-only OR GFDL-1.2-no-invariants-only) AND (GPL-2.0-only WITH Linux-syscall-note) AND GPL-2.0-or-later AND (GPL-2.0-or-later OR BSD-2-Clause) AND (GPL-2.0-or-later OR BSD-3-Clause) AND (GPL-2.0-or-later OR CC-BY-4.0) AND (GPL-2.0-or-later WITH GCC-exception-2.0) AND (GPL-2.0-or-later WITH Linux-syscall-note) AND ISC AND LGPL-2.0-or-later AND (LGPL-2.0-or-later OR BSD-2-Clause) AND (LGPL-2.0-or-later WITH Linux-syscall-note) AND LGPL-2.1-only AND (LGPL-2.1-only OR BSD-2-Clause) AND (LGPL-2.1-only WITH Linux-syscall-note) AND LGPL-2.1-or-later AND (LGPL-2.1-or-later WITH Linux-syscall-note) AND (Linux-OpenIB OR GPL-2.0-only) AND (Linux-OpenIB OR GPL-2.0-only OR BSD-2-Clause) AND Linux-man-pages-copyleft AND MIT AND (MIT OR Apache-2.0) AND (MIT OR GPL-2.0-only) AND (MIT OR GPL-2.0-or-later) AND (MIT OR LGPL-2.1-only) AND (MPL-1.1 OR GPL-2.0-only) AND (X11 OR GPL-2.0-only) AND (X11 OR GPL-2.0-or-later) AND Zlib AND (copyleft-next-0.3.1 OR GPL-2.0-or-later) URL: https://www.kernel.org/ Version: %{specrpmversion} Release: %{pkg_release} @@ -4137,9 +4137,9 @@ fi\ # # %changelog -* Thu Sep 19 2024 Fedora Kernel Team [6.12.0-0.rc0.839c4f596f89.7] -- kernel.spec.template: add CC0-1.0 to License field (Patrick Talbert) -- powerpc: temporary assembler fix (Patrick Talbert) +* Fri Sep 20 2024 Fedora Kernel Team [6.12.0-0.rc0.baeb9a7d8b60.7] +- redhat: change schedule jobs image from cki-tools to builder-rawhide (Patrick Talbert) +- Linux v6.12.0-0.rc0.baeb9a7d8b60 * Thu Sep 19 2024 Fedora Kernel Team [6.12.0-0.rc0.839c4f596f89.6] - Linux v6.12.0-0.rc0.839c4f596f89 diff --git a/patch-6.12-redhat.patch b/patch-6.12-redhat.patch index 4a9b032bf..a26d78f25 100644 --- a/patch-6.12-redhat.patch +++ b/patch-6.12-redhat.patch @@ -5,7 +5,6 @@ Makefile | 48 +- arch/arm/Kconfig | 4 +- arch/arm64/Kconfig | 2 +- - arch/powerpc/include/asm/atomic.h | 6 + arch/s390/include/asm/ipl.h | 1 + arch/s390/kernel/ipl.c | 5 + arch/s390/kernel/setup.c | 4 + @@ -84,7 +83,7 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 12 + - 86 files changed, 2768 insertions(+), 266 deletions(-) + 85 files changed, 2762 insertions(+), 266 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 8337d0fed311..b8d606698384 100644 @@ -290,10 +289,10 @@ index 749179a1d162..3382d64828e4 100644 The VM uses one page of physical memory for each page table. For systems with a lot of processes, this can use a lot of diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index 690e90b62d92..27642fb1c1f3 100644 +index e430ff33c80d..c39758826ff4 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig -@@ -1368,7 +1368,7 @@ endchoice +@@ -1369,7 +1369,7 @@ endchoice config ARM64_FORCE_52BIT bool "Force 52-bit virtual addresses for userspace" @@ -302,23 +301,6 @@ index 690e90b62d92..27642fb1c1f3 100644 help For systems with 52-bit userspace VAs enabled, the kernel will attempt to maintain compatibility with older software by providing 48-bit VAs -diff --git a/arch/powerpc/include/asm/atomic.h b/arch/powerpc/include/asm/atomic.h -index d1ea554c33ed..883187ae4d02 100644 ---- a/arch/powerpc/include/asm/atomic.h -+++ b/arch/powerpc/include/asm/atomic.h -@@ -24,6 +24,12 @@ - #define __atomic_release_fence() \ - __asm__ __volatile__(PPC_RELEASE_BARRIER "" : : : "memory") - -+#ifdef CONFIG_CC_IS_CLANG -+#define DS_FORM_CONSTRAINT "Z<>" -+#else -+#define DS_FORM_CONSTRAINT "YZ<>" -+#endif -+ - static __inline__ int arch_atomic_read(const atomic_t *v) - { - int t; diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h index b0d00032479d..afb9544fb007 100644 --- a/arch/s390/include/asm/ipl.h diff --git a/sources b/sources index 72a7eb0bf..c77c78ef4 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.11-7262-g839c4f596f89.tar.xz) = 8be005e8c58e281caa1b2184d7f516ec4c972bedc2799ffbc8d498954e933a64b868bc71aac0db1de1d5a6a358f2a60209bcf09ca169556ee3b4bc71ad7a558f -SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = 2e3b931e8c781d3582d32de47572720dece3458a1a7b7559eed525a14952f94bd761ddcbbf3722fe562ee13bd8cb087380735ab3220d5793bf3dc0dcb34b2351 -SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = c5d087f54a65d824ad3907b8c6e0278f504ecd1d2279091e0df405b4e90ef627704f7aa21f7d9f47dda91b1b532573f476d0b90ecbb2b79037f4085a5467d4f7 +SHA512 (linux-6.11-7341-gbaeb9a7d8b60.tar.xz) = a0bff3ed315a47a93cdb0d86790ea6af6ca7a723675271feef21f8710d56cfa8979a85b8b063830f50ec7bc9cd5438d45365ce400bd897ea5e6361235098cd57 +SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = 628926ca8aadc3396caefefba3009f2fd45870823026a045d3934b74b819306ab6de238c651770095419c9d858d2fded03e921de1d06a79e8bc6140564b45349 +SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = b29cc02e1534138e811b7f47359f9f83708935179621098cbaccde72f34fe91b6230a82e6fd5262b5b84118eaa63db8254fbddb4284f0fab1e1fac04e670b5a8