From 75b82a74327056a188d973d222395716eadaab4a Mon Sep 17 00:00:00 2001 From: Jan Stancek Date: Tue, 24 Mar 2026 17:45:59 +0100 Subject: [PATCH] kernel-6.12.0-211.5.el10nv * Tue Mar 24 2026 Jan Stancek [6.12.0-211.5.el10nv] - redhat: build default variant with 64k config (Jan Stancek) [VOYAGER-211] Resolves: VOYAGER-211 Signed-off-by: Jan Stancek --- Makefile.rhelver | 2 +- kernel-aarch64-debug-rhel.config | 12 ++++++++---- kernel-aarch64-rhel.config | 12 ++++++++---- kernel.changelog | 4 ++++ kernel.spec | 13 ++++++++----- sources | 6 +++--- 6 files changed, 32 insertions(+), 17 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 4edea240c..fd996c66c 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -41,4 +41,4 @@ AUTOMOTIVE_MINOR = 0 # --------------------------- # # Set DERIVATIVE_STREAM to "yes" to enable derivative kernel versioning. -DERIVATIVE_BUILD = 4 +DERIVATIVE_BUILD = 5 diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index f126d4073..41b122428 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -323,8 +323,8 @@ CONFIG_ARCH_XGENE=y # CONFIG_ARCH_ZYNQMP is not set # CONFIG_ARCNET is not set # CONFIG_ARM64_16K_PAGES is not set -CONFIG_ARM64_4K_PAGES=y -# CONFIG_ARM64_64K_PAGES is not set +# CONFIG_ARM64_4K_PAGES is not set +CONFIG_ARM64_64K_PAGES=y CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y CONFIG_ARM64_AMU_EXTN=y CONFIG_ARM64_BRBE=y @@ -377,7 +377,8 @@ CONFIG_ARM64_HAFT=y CONFIG_ARM64_HW_AFDBM=y CONFIG_ARM64_LSE_ATOMICS=y CONFIG_ARM64_MTE=y -CONFIG_ARM64_PA_BITS_48=y +# CONFIG_ARM64_PA_BITS_48 is not set +CONFIG_ARM64_PA_BITS_52=y CONFIG_ARM64_PAN=y CONFIG_ARM64_PLATFORM_DEVICES=y CONFIG_ARM64_PMEM=y @@ -395,6 +396,7 @@ CONFIG_ARM64_TLB_RANGE=y CONFIG_ARM64_USE_LSE_ATOMICS=y # CONFIG_ARM64_VA_BITS_36 is not set # CONFIG_ARM64_VA_BITS_39 is not set +# CONFIG_ARM64_VA_BITS_42 is not set # CONFIG_ARM64_VA_BITS_47 is not set CONFIG_ARM64_VA_BITS_48=y # CONFIG_ARM64_VA_BITS_52 is not set @@ -2221,6 +2223,7 @@ CONFIG_FIXED_PHY=y CONFIG_FM10K=m # CONFIG_FONTS is not set CONFIG_FONT_SUPPORT=y +CONFIG_FORCE_MAX_ZONEORDER=14 # CONFIG_FORCE_NR_CPUS is not set CONFIG_FORTIFY_KUNIT_TEST=m CONFIG_FORTIFY_SOURCE=y @@ -4918,7 +4921,8 @@ CONFIG_PAGE_OWNER=y CONFIG_PAGE_POISONING=y CONFIG_PAGE_POOL_STATS=y CONFIG_PAGE_REPORTING=y -CONFIG_PAGE_SIZE_4KB=y +# CONFIG_PAGE_SIZE_4KB is not set +CONFIG_PAGE_SIZE_64KB=y CONFIG_PAGE_TABLE_CHECK_ENFORCED=y CONFIG_PAGE_TABLE_CHECK=y # CONFIG_PANEL is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index b51921828..0878edf7f 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -323,8 +323,8 @@ CONFIG_ARCH_XGENE=y # CONFIG_ARCH_ZYNQMP is not set # CONFIG_ARCNET is not set # CONFIG_ARM64_16K_PAGES is not set -CONFIG_ARM64_4K_PAGES=y -# CONFIG_ARM64_64K_PAGES is not set +# CONFIG_ARM64_4K_PAGES is not set +CONFIG_ARM64_64K_PAGES=y CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y CONFIG_ARM64_AMU_EXTN=y CONFIG_ARM64_BRBE=y @@ -377,7 +377,8 @@ CONFIG_ARM64_HAFT=y CONFIG_ARM64_HW_AFDBM=y CONFIG_ARM64_LSE_ATOMICS=y CONFIG_ARM64_MTE=y -CONFIG_ARM64_PA_BITS_48=y +# CONFIG_ARM64_PA_BITS_48 is not set +CONFIG_ARM64_PA_BITS_52=y CONFIG_ARM64_PAN=y CONFIG_ARM64_PLATFORM_DEVICES=y CONFIG_ARM64_PMEM=y @@ -395,6 +396,7 @@ CONFIG_ARM64_TLB_RANGE=y CONFIG_ARM64_USE_LSE_ATOMICS=y # CONFIG_ARM64_VA_BITS_36 is not set # CONFIG_ARM64_VA_BITS_39 is not set +# CONFIG_ARM64_VA_BITS_42 is not set # CONFIG_ARM64_VA_BITS_47 is not set CONFIG_ARM64_VA_BITS_48=y # CONFIG_ARM64_VA_BITS_52 is not set @@ -2205,6 +2207,7 @@ CONFIG_FIXED_PHY=y CONFIG_FM10K=m # CONFIG_FONTS is not set CONFIG_FONT_SUPPORT=y +CONFIG_FORCE_MAX_ZONEORDER=14 # CONFIG_FORCE_NR_CPUS is not set CONFIG_FORTIFY_KUNIT_TEST=m CONFIG_FORTIFY_SOURCE=y @@ -4897,7 +4900,8 @@ CONFIG_PAGE_OWNER=y CONFIG_PAGE_POISONING=y CONFIG_PAGE_POOL_STATS=y CONFIG_PAGE_REPORTING=y -CONFIG_PAGE_SIZE_4KB=y +# CONFIG_PAGE_SIZE_4KB is not set +CONFIG_PAGE_SIZE_64KB=y # CONFIG_PAGE_TABLE_CHECK is not set # CONFIG_PANEL is not set CONFIG_PANIC_ON_OOPS=y diff --git a/kernel.changelog b/kernel.changelog index fdbf3b28c..6cd77d1a3 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,7 @@ +* Tue Mar 24 2026 Jan Stancek [6.12.0-211.5.el10nv] +- redhat: build default variant with 64k config (Jan Stancek) [VOYAGER-211] +Resolves: VOYAGER-211 + * Thu Mar 12 2026 Jan Stancek [6.12.0-211.4.el10nv] - redhat: genlog: add new JIRA cloud server hostname (Jan Stancek) [VOYAGER-211] Resolves: VOYAGER-211 diff --git a/kernel.spec b/kernel.spec index 137577704..b40ab3890 100644 --- a/kernel.spec +++ b/kernel.spec @@ -176,15 +176,15 @@ Summary: The Linux kernel %define specrpmversion 6.12.0 %define specversion 6.12.0 %define patchversion 6.12 -%define pkgrelease 211.4 +%define pkgrelease 211.5 %define kversion 6 -%define tarfile_release 6.12.0-211.4.el10nv +%define tarfile_release 6.12.0-211.5.el10nv # This is needed to do merge window version magic %define patchlevel 12 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 211.4%{?buildid}%{?dist} +%define specrelease 211.5%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.12.0-211.4.el10nv +%define kabiversion 6.12.0-211.5.el10nv # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -233,7 +233,7 @@ Summary: The Linux kernel %ifarch aarch64 %if 0%{?_without_arm64_4k} -%define with_up 0 +# FIXME: temp change until tools support 64k packages define with_up 0 %endif %endif @@ -4492,6 +4492,9 @@ fi\ # # %changelog +* Tue Mar 24 2026 Jan Stancek [6.12.0-211.5.el10nv] +- redhat: build default variant with 64k config (Jan Stancek) [VOYAGER-211] + * Thu Mar 12 2026 Jan Stancek [6.12.0-211.4.el10nv] - redhat: genlog: add new JIRA cloud server hostname (Jan Stancek) [VOYAGER-211] diff --git a/sources b/sources index 2cfdb46d5..54a748acd 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.12.0-211.4.el10nv.tar.xz) = 369c2999298aca076b956d6da9c673f87ee072c450ba3328c9a946215168e1aebb400a80b9310bc5b8d8a9b61f604a44fa4892b142abbb92e12ea65939cb9e05 -SHA512 (kernel-abi-stablelists-6.12.0-211.4.el10nv.tar.xz) = 965c5f8ecdffc85f80931e88495d32dc2f44abf6ff6cf2b3bc1b60cb6d71c0d13ce2f07c4bef945fecc86d938c19c5d37136af917d8a81cec883dac4ed44d142 -SHA512 (kernel-kabi-dw-6.12.0-211.4.el10nv.tar.xz) = f991de25e32729e4e8681ac7d501630ba482ace531af8280ef6925a7d041e4c9d0806a96210f71f6406d0db6c77ef1844c541c40ee4c8f550ca5dd6a4b303488 +SHA512 (linux-6.12.0-211.5.el10nv.tar.xz) = aa56806d000b69914196402901d7e8f103ebb6a0e076c71d02809d5adf938f68f2b988bcdec177dae9d7788a81b4558f25ff6fa2f7575f0e29085e81005feb54 +SHA512 (kernel-abi-stablelists-6.12.0-211.5.el10nv.tar.xz) = 9ab83433a34359238cfe14fe8a0106492107ce3c406694dffb5afae5f4c86ed4b02c4b1a216830644bbed8d1d3c45d785f9f40d0a281ad737054dc48efb6dec7 +SHA512 (kernel-kabi-dw-6.12.0-211.5.el10nv.tar.xz) = d79bef3e74534850de62ea38b0fa221ee0451bcaea614ce4f19a88c124fb5920b23e9af1a5f507bcd84eda9a9aec2c4b0f5dcab1ed08540cb1cb5c13fefcbc7a