diff --git a/Makefile.rhelver b/Makefile.rhelver index 2b0c556c2..6fb76bfb8 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 1 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 97 +RHEL_RELEASE = 98 # # RHEL_REBASE_NUM diff --git a/kernel.changelog b/kernel.changelog index a71db6c94..2e134241c 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,24 @@ +* Tue Jun 17 2025 Julio Faracco [6.12.0-98.el10] +- fs/file.c: add fast path in find_next_fd() (Ian Kent) [RHEL-38569] +- fs/file.c: conditionally clear full_fds (Ian Kent) [RHEL-38569] +- fs/file.c: remove sanity_check and add likely/unlikely in alloc_fd() (Ian Kent) [RHEL-38569] +- redhat/kernel.spec: drop modules-extra-matched for noarch (Jan Stancek) [RHEL-95740] +- tracing/osnoise: Allow arbitrarily long CPU string (Tomas Glozar) [RHEL-86520] +- RDMA/irdma: Remove deliver net device event (Kamal Heib) [RHEL-87577] +- RDMA/irdma: Remove unused irdma_cqp_*_fpm_val_cmd functions (Kamal Heib) [RHEL-87577] +- ovl: don't require "metacopy=on" for "verity" (Miklos Szeredi) [RHEL-82858] +- ovl: relax redirect/metacopy requirements for lower -> data redirect (Miklos Szeredi) [RHEL-82858] +- ovl: make redirect/metacopy rejection consistent (Miklos Szeredi) [RHEL-82858] +- ovl: remove unused forward declaration (Miklos Szeredi) [RHEL-82858] +- ovl: don't allow datadir only (Miklos Szeredi) [RHEL-82858] +- smb: client: fix UAF in decryption with multichannel (CKI Backport Bot) [RHEL-94466] {CVE-2025-37750} +- Merge DRM changes from upstream v6.13..v6.14 (José Expósito) [RHEL-75957] +- Merge DRM changes from upstream v6.12..v6.13 (José Expósito) [RHEL-75957] +- selftests/bpf: lwt_seg6local: Move test to test_progs (Hangbin Liu) [RHEL-82844] +- selftests/bpf: lwt_seg6local: Remove unused routes (Hangbin Liu) [RHEL-82844] +- selftests/bpf: add missing header include for htons (Hangbin Liu) [RHEL-82844] +Resolves: RHEL-38569, RHEL-75957, RHEL-82844, RHEL-82858, RHEL-86520, RHEL-87577, RHEL-94466, RHEL-95740 + * Tue Jun 17 2025 Julio Faracco [6.12.0-97.el10] - memcg: always call cond_resched() after fn() (Radostin Stoyanov) [RHEL-81199] - memcg: fix soft lockup in the OOM process (Radostin Stoyanov) [RHEL-81199] {CVE-2024-57977} diff --git a/kernel.spec b/kernel.spec index 45b9abb7c..49f2b56ae 100644 --- a/kernel.spec +++ b/kernel.spec @@ -162,15 +162,15 @@ Summary: The Linux kernel %define specrpmversion 6.12.0 %define specversion 6.12.0 %define patchversion 6.12 -%define pkgrelease 97 +%define pkgrelease 98 %define kversion 6 -%define tarfile_release 6.12.0-97.el10 +%define tarfile_release 6.12.0-98.el10 # This is needed to do merge window version magic %define patchlevel 12 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 97%{?buildid}%{?dist} +%define specrelease 98%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.12.0-97.el10 +%define kabiversion 6.12.0-98.el10 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -1828,7 +1828,9 @@ Prebuilt 64k unified kernel image for virtual machines. Prebuilt 64k unified kernel image addons for virtual machines. %endif +%ifnarch noarch %{nobuildarches} %kernel_modules_extra_matched_package +%endif %define log_msg() \ { set +x; } 2>/dev/null \ @@ -4258,13 +4260,35 @@ fi\ %kernel_variant_files %{_use_vdso} %{with_debug} rt-64k-debug %endif +%ifnarch noarch %{nobuildarches} %files modules-extra-matched +%endif # plz don't put in a version string unless you're going to tag # and build. # # %changelog +* Tue Jun 17 2025 Julio Faracco [6.12.0-98.el10] +- fs/file.c: add fast path in find_next_fd() (Ian Kent) [RHEL-38569] +- fs/file.c: conditionally clear full_fds (Ian Kent) [RHEL-38569] +- fs/file.c: remove sanity_check and add likely/unlikely in alloc_fd() (Ian Kent) [RHEL-38569] +- redhat/kernel.spec: drop modules-extra-matched for noarch (Jan Stancek) [RHEL-95740] +- tracing/osnoise: Allow arbitrarily long CPU string (Tomas Glozar) [RHEL-86520] +- RDMA/irdma: Remove deliver net device event (Kamal Heib) [RHEL-87577] +- RDMA/irdma: Remove unused irdma_cqp_*_fpm_val_cmd functions (Kamal Heib) [RHEL-87577] +- ovl: don't require "metacopy=on" for "verity" (Miklos Szeredi) [RHEL-82858] +- ovl: relax redirect/metacopy requirements for lower -> data redirect (Miklos Szeredi) [RHEL-82858] +- ovl: make redirect/metacopy rejection consistent (Miklos Szeredi) [RHEL-82858] +- ovl: remove unused forward declaration (Miklos Szeredi) [RHEL-82858] +- ovl: don't allow datadir only (Miklos Szeredi) [RHEL-82858] +- smb: client: fix UAF in decryption with multichannel (CKI Backport Bot) [RHEL-94466] {CVE-2025-37750} +- Merge DRM changes from upstream v6.13..v6.14 (José Expósito) [RHEL-75957] +- Merge DRM changes from upstream v6.12..v6.13 (José Expósito) [RHEL-75957] +- selftests/bpf: lwt_seg6local: Move test to test_progs (Hangbin Liu) [RHEL-82844] +- selftests/bpf: lwt_seg6local: Remove unused routes (Hangbin Liu) [RHEL-82844] +- selftests/bpf: add missing header include for htons (Hangbin Liu) [RHEL-82844] + * Tue Jun 17 2025 Julio Faracco [6.12.0-97.el10] - memcg: always call cond_resched() after fn() (Radostin Stoyanov) [RHEL-81199] - memcg: fix soft lockup in the OOM process (Radostin Stoyanov) [RHEL-81199] {CVE-2024-57977} diff --git a/sources b/sources index 3d7f4e05c..bd581558d 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6 -SHA512 (linux-6.12.0-97.el10.tar.xz) = bb9b74fe739b4a7bcb7c522d194fad74d25a84098ab8bb8410c8470b29b7833f8344f42678a04a90202fcee6a4bb1bcd4228ba8b533c3b8c12378448221cdfe0 -SHA512 (kernel-abi-stablelists-6.12.0-97.el10.tar.xz) = f388c27c5f10318d1bc24c08449a789ebc717aae8e8350e4ae7a572542e982c272bcd63d130e576dae13984134c5b9cc6c1edb6fa138fadeac0c984b846fd9df -SHA512 (kernel-kabi-dw-6.12.0-97.el10.tar.xz) = 60ebd251927400a2791c1844d03b746266ececf5424663b40ec83bd9b2495b3a5d3a56f00d41fc25757b9b6d5639406af26f1a104877c69785dbd17cc957484c +SHA512 (linux-6.12.0-98.el10.tar.xz) = a63a2b8715299305b6c80dca58b8d30b8aafe9139c74342f294425ed2d0bd9332969a3cae867d0e537628d52d78965d2d5ef9e25239bd6164f2508d694e46b8b +SHA512 (kernel-abi-stablelists-6.12.0-98.el10.tar.xz) = 61e4ab269b52a01a51409ff65a76e76740ce8c2becc42a6d4d0e13558d4e49f212b3e5ebf9d8d89865bb3962b41b0335cd3045011903486c91b41479fa215131 +SHA512 (kernel-kabi-dw-6.12.0-98.el10.tar.xz) = 60ebd251927400a2791c1844d03b746266ececf5424663b40ec83bd9b2495b3a5d3a56f00d41fc25757b9b6d5639406af26f1a104877c69785dbd17cc957484c