diff --git a/Makefile.rhelver b/Makefile.rhelver index 076ae9c59..9826d97f6 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 48 +RHEL_RELEASE = 51 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 3c91f7fce..dc2ebfd79 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,8 +1,8 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/ae3292a75c733087a32a5bff4ac794976485b228 - ae3292a75c733087a32a5bff4ac794976485b228 tools/rtla: fix collision with glibc sched_attr/sched_set_attr +https://gitlab.com/cki-project/kernel-ark/-/commit/783a1dcee8d9e06f7800b466a196777bf15e63d1 + 783a1dcee8d9e06f7800b466a196777bf15e63d1 tools/rtla: fix collision with glibc sched_attr/sched_set_attr -https://gitlab.com/cki-project/kernel-ark/-/commit/75fdb6d6835c67fc3db236011b3117573fc134cd - 75fdb6d6835c67fc3db236011b3117573fc134cd tools/rtla: drop __NR_sched_getattr +https://gitlab.com/cki-project/kernel-ark/-/commit/5e9a02a2c46ad648a8d3cca1d46397e0d5716e63 + 5e9a02a2c46ad648a8d3cca1d46397e0d5716e63 tools/rtla: drop __NR_sched_getattr https://gitlab.com/cki-project/kernel-ark/-/commit/0756902dd6b52af5d02b221e5ea50565d31a50e7 0756902dd6b52af5d02b221e5ea50565d31a50e7 Update the RHEL_DIFFERENCES help string diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 86a10758b..a40445eb6 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -3525,7 +3525,7 @@ CONFIG_LRU_GEN_ENABLED=y # CONFIG_LRU_GEN_STATS is not set CONFIG_LRU_GEN=y CONFIG_LSI_ET1011C_PHY=m -CONFIG_LSM="lockdown,yama,integrity,selinux,bpf" +CONFIG_LSM="lockdown,yama,integrity,selinux,bpf,landlock" CONFIG_LSM_MMAP_MIN_ADDR=65535 # CONFIG_LTC1660 is not set # CONFIG_LTC2309 is not set @@ -5875,7 +5875,7 @@ CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITYFS=y CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_IPE is not set -# CONFIG_SECURITY_LANDLOCK is not set +CONFIG_SECURITY_LANDLOCK=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y CONFIG_SECURITY_LOCKDOWN_LSM=y diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index fe0d82930..fdf04d80d 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -3504,7 +3504,7 @@ CONFIG_LRU_GEN_ENABLED=y # CONFIG_LRU_GEN_STATS is not set CONFIG_LRU_GEN=y CONFIG_LSI_ET1011C_PHY=m -CONFIG_LSM="lockdown,yama,integrity,selinux,bpf" +CONFIG_LSM="lockdown,yama,integrity,selinux,bpf,landlock" CONFIG_LSM_MMAP_MIN_ADDR=65535 # CONFIG_LTC1660 is not set # CONFIG_LTC2309 is not set @@ -5852,7 +5852,7 @@ CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITYFS=y CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_IPE is not set -# CONFIG_SECURITY_LANDLOCK is not set +CONFIG_SECURITY_LANDLOCK=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y CONFIG_SECURITY_LOCKDOWN_LSM=y diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 9a9432d45..0ee03628c 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -3522,7 +3522,7 @@ CONFIG_LRU_GEN_ENABLED=y # CONFIG_LRU_GEN_STATS is not set CONFIG_LRU_GEN=y CONFIG_LSI_ET1011C_PHY=m -CONFIG_LSM="lockdown,yama,integrity,selinux,bpf" +CONFIG_LSM="lockdown,yama,integrity,selinux,bpf,landlock" CONFIG_LSM_MMAP_MIN_ADDR=65535 # CONFIG_LTC1660 is not set # CONFIG_LTC2309 is not set @@ -5871,7 +5871,7 @@ CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITYFS=y CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_IPE is not set -# CONFIG_SECURITY_LANDLOCK is not set +CONFIG_SECURITY_LANDLOCK=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y CONFIG_SECURITY_LOCKDOWN_LSM=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 3de9ca180..d80f89cc2 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -3501,7 +3501,7 @@ CONFIG_LRU_GEN_ENABLED=y # CONFIG_LRU_GEN_STATS is not set CONFIG_LRU_GEN=y CONFIG_LSI_ET1011C_PHY=m -CONFIG_LSM="lockdown,yama,integrity,selinux,bpf" +CONFIG_LSM="lockdown,yama,integrity,selinux,bpf,landlock" CONFIG_LSM_MMAP_MIN_ADDR=65535 # CONFIG_LTC1660 is not set # CONFIG_LTC2309 is not set @@ -5848,7 +5848,7 @@ CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITYFS=y CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_IPE is not set -# CONFIG_SECURITY_LANDLOCK is not set +CONFIG_SECURITY_LANDLOCK=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y CONFIG_SECURITY_LOCKDOWN_LSM=y diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index b03f703b9..4aabca113 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -3563,7 +3563,7 @@ CONFIG_LRU_GEN_ENABLED=y # CONFIG_LRU_GEN_STATS is not set CONFIG_LRU_GEN=y CONFIG_LSI_ET1011C_PHY=m -CONFIG_LSM="lockdown,yama,integrity,selinux,bpf" +CONFIG_LSM="lockdown,yama,integrity,selinux,bpf,landlock" CONFIG_LSM_MMAP_MIN_ADDR=65535 # CONFIG_LTC1660 is not set # CONFIG_LTC2309 is not set @@ -5918,7 +5918,7 @@ CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITYFS=y CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_IPE is not set -# CONFIG_SECURITY_LANDLOCK is not set +CONFIG_SECURITY_LANDLOCK=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y CONFIG_SECURITY_LOCKDOWN_LSM=y diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index e93d02b56..a2c2b0259 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -3542,7 +3542,7 @@ CONFIG_LRU_GEN_ENABLED=y # CONFIG_LRU_GEN_STATS is not set CONFIG_LRU_GEN=y CONFIG_LSI_ET1011C_PHY=m -CONFIG_LSM="lockdown,yama,integrity,selinux,bpf" +CONFIG_LSM="lockdown,yama,integrity,selinux,bpf,landlock" CONFIG_LSM_MMAP_MIN_ADDR=65535 # CONFIG_LTC1660 is not set # CONFIG_LTC2309 is not set @@ -5895,7 +5895,7 @@ CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITYFS=y CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_IPE is not set -# CONFIG_SECURITY_LANDLOCK is not set +CONFIG_SECURITY_LANDLOCK=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y CONFIG_SECURITY_LOCKDOWN_LSM=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 608457f7d..7cb80bc16 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -3199,7 +3199,7 @@ CONFIG_LRU_GEN_ENABLED=y # CONFIG_LRU_GEN_STATS is not set CONFIG_LRU_GEN=y CONFIG_LSI_ET1011C_PHY=m -CONFIG_LSM="lockdown,yama,integrity,selinux,bpf" +CONFIG_LSM="lockdown,yama,integrity,selinux,bpf,landlock" CONFIG_LSM_MMAP_MIN_ADDR=65535 # CONFIG_LTC1660 is not set # CONFIG_LTC2309 is not set @@ -5400,7 +5400,7 @@ CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITYFS=y CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_IPE is not set -# CONFIG_SECURITY_LANDLOCK is not set +CONFIG_SECURITY_LANDLOCK=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y CONFIG_SECURITY_LOCKDOWN_LSM=y diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 6f7c86eaf..a562fb968 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -3179,7 +3179,7 @@ CONFIG_LRU_GEN_ENABLED=y # CONFIG_LRU_GEN_STATS is not set CONFIG_LRU_GEN=y CONFIG_LSI_ET1011C_PHY=m -CONFIG_LSM="lockdown,yama,integrity,selinux,bpf" +CONFIG_LSM="lockdown,yama,integrity,selinux,bpf,landlock" CONFIG_LSM_MMAP_MIN_ADDR=65535 # CONFIG_LTC1660 is not set # CONFIG_LTC2309 is not set @@ -5379,7 +5379,7 @@ CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITYFS=y CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_IPE is not set -# CONFIG_SECURITY_LANDLOCK is not set +CONFIG_SECURITY_LANDLOCK=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y CONFIG_SECURITY_LOCKDOWN_LSM=y diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index e0439c4e8..05340ba93 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -3170,7 +3170,7 @@ CONFIG_LRU_GEN_ENABLED=y # CONFIG_LRU_GEN_STATS is not set CONFIG_LRU_GEN=y # CONFIG_LSI_ET1011C_PHY is not set -CONFIG_LSM="lockdown,yama,integrity,selinux,bpf" +CONFIG_LSM="lockdown,yama,integrity,selinux,bpf,landlock" CONFIG_LSM_MMAP_MIN_ADDR=65535 # CONFIG_LTC1660 is not set # CONFIG_LTC2309 is not set @@ -5374,7 +5374,7 @@ CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITYFS=y CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_IPE is not set -# CONFIG_SECURITY_LANDLOCK is not set +CONFIG_SECURITY_LANDLOCK=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y CONFIG_SECURITY_LOCKDOWN_LSM=y diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 54a115b17..4cc498a68 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -3150,7 +3150,7 @@ CONFIG_LRU_GEN_ENABLED=y # CONFIG_LRU_GEN_STATS is not set CONFIG_LRU_GEN=y # CONFIG_LSI_ET1011C_PHY is not set -CONFIG_LSM="lockdown,yama,integrity,selinux,bpf" +CONFIG_LSM="lockdown,yama,integrity,selinux,bpf,landlock" CONFIG_LSM_MMAP_MIN_ADDR=65535 # CONFIG_LTC1660 is not set # CONFIG_LTC2309 is not set @@ -5353,7 +5353,7 @@ CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITYFS=y CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_IPE is not set -# CONFIG_SECURITY_LANDLOCK is not set +CONFIG_SECURITY_LANDLOCK=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y CONFIG_SECURITY_LOCKDOWN_LSM=y diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index fc8362bea..b407a1bfd 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -3159,7 +3159,7 @@ CONFIG_LRU_GEN_ENABLED=y # CONFIG_LRU_GEN_STATS is not set CONFIG_LRU_GEN=y # CONFIG_LSI_ET1011C_PHY is not set -CONFIG_LSM="lockdown,yama,integrity,selinux,bpf" +CONFIG_LSM="lockdown,yama,integrity,selinux,bpf,landlock" CONFIG_LSM_MMAP_MIN_ADDR=65535 # CONFIG_LTC1660 is not set # CONFIG_LTC2309 is not set @@ -5370,7 +5370,7 @@ CONFIG_SECURITYFS=y CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_IPE is not set # CONFIG_SECURITY is not set -# CONFIG_SECURITY_LANDLOCK is not set +CONFIG_SECURITY_LANDLOCK=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y CONFIG_SECURITY_LOCKDOWN_LSM=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 6b3ff74d5..3382c3111 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -3390,7 +3390,7 @@ CONFIG_LRU_GEN_ENABLED=y # CONFIG_LRU_GEN_STATS is not set CONFIG_LRU_GEN=y CONFIG_LSI_ET1011C_PHY=m -CONFIG_LSM="lockdown,yama,integrity,selinux,bpf" +CONFIG_LSM="lockdown,yama,integrity,selinux,bpf,landlock" CONFIG_LSM_MMAP_MIN_ADDR=65535 # CONFIG_LTC1660 is not set # CONFIG_LTC2309 is not set @@ -5645,7 +5645,7 @@ CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITYFS=y CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_IPE is not set -# CONFIG_SECURITY_LANDLOCK is not set +CONFIG_SECURITY_LANDLOCK=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y CONFIG_SECURITY_LOCKDOWN_LSM=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 0908a5f84..abe242dd4 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -3370,7 +3370,7 @@ CONFIG_LRU_GEN_ENABLED=y # CONFIG_LRU_GEN_STATS is not set CONFIG_LRU_GEN=y CONFIG_LSI_ET1011C_PHY=m -CONFIG_LSM="lockdown,yama,integrity,selinux,bpf" +CONFIG_LSM="lockdown,yama,integrity,selinux,bpf,landlock" CONFIG_LSM_MMAP_MIN_ADDR=65535 # CONFIG_LTC1660 is not set # CONFIG_LTC2309 is not set @@ -5623,7 +5623,7 @@ CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITYFS=y CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_IPE is not set -# CONFIG_SECURITY_LANDLOCK is not set +CONFIG_SECURITY_LANDLOCK=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y CONFIG_SECURITY_LOCKDOWN_LSM=y diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 08606e3e7..569e129b8 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -3431,7 +3431,7 @@ CONFIG_LRU_GEN_ENABLED=y # CONFIG_LRU_GEN_STATS is not set CONFIG_LRU_GEN=y CONFIG_LSI_ET1011C_PHY=m -CONFIG_LSM="lockdown,yama,integrity,selinux,bpf" +CONFIG_LSM="lockdown,yama,integrity,selinux,bpf,landlock" CONFIG_LSM_MMAP_MIN_ADDR=65535 # CONFIG_LTC1660 is not set # CONFIG_LTC2309 is not set @@ -5692,7 +5692,7 @@ CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITYFS=y CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_IPE is not set -# CONFIG_SECURITY_LANDLOCK is not set +CONFIG_SECURITY_LANDLOCK=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y CONFIG_SECURITY_LOCKDOWN_LSM=y diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index ebb24b0a7..1b6d13997 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -3411,7 +3411,7 @@ CONFIG_LRU_GEN_ENABLED=y # CONFIG_LRU_GEN_STATS is not set CONFIG_LRU_GEN=y CONFIG_LSI_ET1011C_PHY=m -CONFIG_LSM="lockdown,yama,integrity,selinux,bpf" +CONFIG_LSM="lockdown,yama,integrity,selinux,bpf,landlock" CONFIG_LSM_MMAP_MIN_ADDR=65535 # CONFIG_LTC1660 is not set # CONFIG_LTC2309 is not set @@ -5670,7 +5670,7 @@ CONFIG_SECURITY_DMESG_RESTRICT=y CONFIG_SECURITYFS=y CONFIG_SECURITY_INFINIBAND=y # CONFIG_SECURITY_IPE is not set -# CONFIG_SECURITY_LANDLOCK is not set +CONFIG_SECURITY_LANDLOCK=y # CONFIG_SECURITY_LOADPIN is not set CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y CONFIG_SECURITY_LOCKDOWN_LSM=y diff --git a/kernel.changelog b/kernel.changelog index 5e10d3587..44e7bba69 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,8 +1,22 @@ -* Fri Nov 01 2024 Fedora Kernel Team [6.12.0-0.rc5.6c52d4da1c74.48] +* Mon Nov 04 2024 Fedora Kernel Team [6.12.0-0.rc6.51] - tools/rtla: fix collision with glibc sched_attr/sched_set_attr (Jan Stancek) - tools/rtla: drop __NR_sched_getattr (Jan Stancek) Resolves: +* Mon Nov 04 2024 Fedora Kernel Team [6.12.0-0.rc6.50] +- redhat/configs: add bootconfig to kernel-tools package (Brian Masney) +- Enable CONFIG_SECURITY_LANDLOCK for RHEL (Zbigniew Jędrzejewski-Szmek) [RHEL-8810] +- Linux v6.12.0-0.rc6 +Resolves: RHEL-8810 + +* Sun Nov 03 2024 Fedora Kernel Team [6.12.0-0.rc5.3e5e6c9900c3.49] +- Linux v6.12.0-0.rc5.3e5e6c9900c3 +Resolves: + +* Sat Nov 02 2024 Fedora Kernel Team [6.12.0-0.rc5.11066801dd4b.48] +- Linux v6.12.0-0.rc5.11066801dd4b +Resolves: + * Fri Nov 01 2024 Fedora Kernel Team [6.12.0-0.rc5.6c52d4da1c74.47] - redhat: configs: Drop CONFIG_MEMSTICK_REALTEK_PCI config option (Desnes Nunes) - Linux v6.12.0-0.rc5.6c52d4da1c74 diff --git a/kernel.spec b/kernel.spec index 23e69a2f9..50b554d3a 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.rc5.20241101git6c52d4da1c74.48 +%define pkgrelease 0.rc6.51 %define kversion 6 -%define tarfile_release 6.12-rc5-181-g6c52d4da1c74 +%define tarfile_release 6.12-rc6 # This is needed to do merge window version magic %define patchlevel 12 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.20241101git6c52d4da1c74.48%{?buildid}%{?dist} +%define specrelease 0.rc6.51%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.12.0 @@ -1242,7 +1242,7 @@ This package provides debug information for package %{package_name}-tools. # symlinks because of the trailing nonmatching alternation and # the leading .*, because of find-debuginfo.sh's buggy handling # of matching the pattern against the symlinks file. -%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_bindir}/centrino-decode(\.debug)?|.*%%{_bindir}/powernow-k8-decode(\.debug)?|.*%%{_bindir}/cpupower(\.debug)?|.*%%{_libdir}/libcpupower.*|.*%%{_bindir}/turbostat(\.debug)?|.*%%{_bindir}/x86_energy_perf_policy(\.debug)?|.*%%{_bindir}/tmon(\.debug)?|.*%%{_bindir}/lsgpio(\.debug)?|.*%%{_bindir}/gpio-hammer(\.debug)?|.*%%{_bindir}/gpio-event-mon(\.debug)?|.*%%{_bindir}/gpio-watch(\.debug)?|.*%%{_bindir}/iio_event_monitor(\.debug)?|.*%%{_bindir}/iio_generic_buffer(\.debug)?|.*%%{_bindir}/lsiio(\.debug)?|.*%%{_bindir}/intel-speed-select(\.debug)?|.*%%{_bindir}/page_owner_sort(\.debug)?|.*%%{_bindir}/slabinfo(\.debug)?|.*%%{_sbindir}/intel_sdsi(\.debug)?|XXX' -o %{package_name}-tools-debuginfo.list} +%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_bindir}/bootconfig(\.debug)?|.*%%{_bindir}/centrino-decode(\.debug)?|.*%%{_bindir}/powernow-k8-decode(\.debug)?|.*%%{_bindir}/cpupower(\.debug)?|.*%%{_libdir}/libcpupower.*|.*%%{_bindir}/turbostat(\.debug)?|.*%%{_bindir}/x86_energy_perf_policy(\.debug)?|.*%%{_bindir}/tmon(\.debug)?|.*%%{_bindir}/lsgpio(\.debug)?|.*%%{_bindir}/gpio-hammer(\.debug)?|.*%%{_bindir}/gpio-event-mon(\.debug)?|.*%%{_bindir}/gpio-watch(\.debug)?|.*%%{_bindir}/iio_event_monitor(\.debug)?|.*%%{_bindir}/iio_generic_buffer(\.debug)?|.*%%{_bindir}/lsiio(\.debug)?|.*%%{_bindir}/intel-speed-select(\.debug)?|.*%%{_bindir}/page_owner_sort(\.debug)?|.*%%{_bindir}/slabinfo(\.debug)?|.*%%{_sbindir}/intel_sdsi(\.debug)?|XXX' -o %{package_name}-tools-debuginfo.list} %package -n rtla %if 0%{gemini} @@ -3045,6 +3045,10 @@ pushd tools/thermal/tmon/ %{log_msg "build tmon"} %{tools_make} popd +pushd tools/bootconfig/ +%{log_msg "build bootconfig"} +%{tools_make} +popd pushd tools/iio/ %{log_msg "build iio"} %{tools_make} @@ -3359,6 +3363,9 @@ chmod 0755 %{buildroot}%{_libdir}/libcpupower.so* pushd tools/thermal/tmon %{tools_make} INSTALL_ROOT=%{buildroot} install popd +pushd tools/bootconfig +%{tools_make} DESTDIR=%{buildroot} install +popd pushd tools/iio %{tools_make} DESTDIR=%{buildroot} install popd @@ -3886,6 +3893,7 @@ fi\ # cpupowerarchs %endif %{_bindir}/tmon +%{_bindir}/bootconfig %{_bindir}/iio_event_monitor %{_bindir}/iio_generic_buffer %{_bindir}/lsiio @@ -4144,10 +4152,21 @@ fi\ # # %changelog -* Fri Nov 01 2024 Fedora Kernel Team [6.12.0-0.rc5.6c52d4da1c74.48] +* Mon Nov 04 2024 Fedora Kernel Team [6.12.0-0.rc6.51] - tools/rtla: fix collision with glibc sched_attr/sched_set_attr (Jan Stancek) - tools/rtla: drop __NR_sched_getattr (Jan Stancek) +* Mon Nov 04 2024 Fedora Kernel Team [6.12.0-0.rc6.50] +- redhat/configs: add bootconfig to kernel-tools package (Brian Masney) +- Enable CONFIG_SECURITY_LANDLOCK for RHEL (Zbigniew Jędrzejewski-Szmek) [RHEL-8810] +- Linux v6.12.0-0.rc6 + +* Sun Nov 03 2024 Fedora Kernel Team [6.12.0-0.rc5.3e5e6c9900c3.49] +- Linux v6.12.0-0.rc5.3e5e6c9900c3 + +* Sat Nov 02 2024 Fedora Kernel Team [6.12.0-0.rc5.11066801dd4b.48] +- Linux v6.12.0-0.rc5.11066801dd4b + * Fri Nov 01 2024 Fedora Kernel Team [6.12.0-0.rc5.6c52d4da1c74.47] - redhat: configs: Drop CONFIG_MEMSTICK_REALTEK_PCI config option (Desnes Nunes) - Linux v6.12.0-0.rc5.6c52d4da1c74 diff --git a/patch-6.12-redhat.patch b/patch-6.12-redhat.patch index eef06c60e..d9af6b8d2 100644 --- a/patch-6.12-redhat.patch +++ b/patch-6.12-redhat.patch @@ -190,7 +190,7 @@ index 000000000000..fd77bd5c97e2 + +endmenu diff --git a/Makefile b/Makefile -index 5e04e4abffd8..26c63dabcb0a 100644 +index b8efbfe9da94..1a9cf46a5cf0 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1944,10 +1944,10 @@ index a00671b58701..eeef2766b8b3 100644 if (ret < 0) goto err_allowedips; diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 84cb859a911d..a02f37cc8376 100644 +index b149b638453f..34d3f25498d3 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c -@@ -263,6 +263,9 @@ void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) +@@ -274,6 +274,9 @@ void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) static blk_status_t nvme_error_status(u16 status) { @@ -1957,7 +1957,7 @@ index 84cb859a911d..a02f37cc8376 100644 switch (status & NVME_SCT_SC_MASK) { case NVME_SC_SUCCESS: return BLK_STS_OK; -@@ -377,6 +380,7 @@ enum nvme_disposition { +@@ -388,6 +391,7 @@ enum nvme_disposition { COMPLETE, RETRY, FAILOVER, @@ -1965,7 +1965,7 @@ index 84cb859a911d..a02f37cc8376 100644 AUTHENTICATE, }; -@@ -385,7 +389,7 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req) +@@ -396,7 +400,7 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req) if (likely(nvme_req(req)->status == 0)) return COMPLETE; @@ -1974,7 +1974,7 @@ index 84cb859a911d..a02f37cc8376 100644 (nvme_req(req)->status & NVME_STATUS_DNR) || nvme_req(req)->retries >= nvme_max_retries) return COMPLETE; -@@ -393,10 +397,11 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req) +@@ -404,10 +408,11 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req) if ((nvme_req(req)->status & NVME_SCT_SC_MASK) == NVME_SC_AUTH_REQUIRED) return AUTHENTICATE; @@ -1988,7 +1988,7 @@ index 84cb859a911d..a02f37cc8376 100644 } else { if (blk_queue_dying(req->q)) return COMPLETE; -@@ -438,6 +443,14 @@ void nvme_end_req(struct request *req) +@@ -449,6 +454,14 @@ void nvme_end_req(struct request *req) blk_mq_end_request(req, status); } @@ -2003,7 +2003,7 @@ index 84cb859a911d..a02f37cc8376 100644 void nvme_complete_rq(struct request *req) { struct nvme_ctrl *ctrl = nvme_req(req)->ctrl; -@@ -467,6 +480,9 @@ void nvme_complete_rq(struct request *req) +@@ -478,6 +491,9 @@ void nvme_complete_rq(struct request *req) case FAILOVER: nvme_failover_req(req); return; @@ -2463,7 +2463,7 @@ index a14f6013e316..6c20453fdf76 100644 error_proc: diff --git a/fs/erofs/super.c b/fs/erofs/super.c -index 320d586c3896..48a4b16def33 100644 +index bed3dbe5b7cb..6be03e096da8 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -591,6 +591,9 @@ static int erofs_fc_fill_super(struct super_block *sb, struct fs_context *fc) diff --git a/sources b/sources index 52d8c8d3b..aa35d8968 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.12-rc5-181-g6c52d4da1c74.tar.xz) = 1f9a8b2aca8c37b6d09fb11505f3255cd40784bd675dc7433d7577cc8a8d7c7f369a82d6eaf2282bdc99e424355a67d7d0fe0f95ac11ec7d522fe0acd7d9eb8f -SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = 9fae7c1ecfca9c728aff4c78bedbbdc86b396f85cac9c6cc0dc5461ac01dbfadd806da461f10c47b75dde74a74991f62eb8c999c37a024e5c51d230263531a19 -SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = 3c23a658e29d70a3dfc83069511bd742cbfc8cf356d42aaa8436d3338bfbdd09d5e847341eda92b9a3a9d57085f54a8aeb8f1d563c21448f103b8243d418edfc +SHA512 (linux-6.12-rc6.tar.xz) = b31d939091ae017707fe7222d5700048eba927adaf00dac47b50971274b8aa74a70cd1e9de9ec723ce6072e101e4a89b9e95e6bf6d4bfd5646ddebae606a1e2c +SHA512 (kernel-abi-stablelists-6.12.0.tar.xz) = b53c8b78979b2666488f3c41f3f721ec37c30ee253a2c6b7d2e6ae082491544153a2d44b51693a14de85350d0acb704b1fa900794a3a7b8b6410d788997d4b68 +SHA512 (kernel-kabi-dw-6.12.0.tar.xz) = 2d6ddc7ca22e93679d3883ff6ae6fd43f4172850819968ee59a7bb3db5a08f2086b0ea51b95dae5d0faf0c70ce92c7216f803e2a01d51d50d0651e3c27c202b1