From bfb178b1b5b7dc324d4f6810c6119db830270b7a Mon Sep 17 00:00:00 2001 From: Augusto Caringi Date: Mar 19 2024 18:04:01 +0000 Subject: kernel-6.9.0-0.rc0.20240319gitb3603fcb79b1.11 * Tue Mar 19 2024 Fedora Kernel Team [6.9.0-0.rc0.b3603fcb79b1.11] - Add new of_test module to mod-internal.list (Thorsten Leemhuis) - Add new string kunit modules to mod-internal.list (Thorsten Leemhuis) Resolves: Signed-off-by: Augusto Caringi --- diff --git a/Makefile.rhelver b/Makefile.rhelver index 9ff2043..7f148a4 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 = 10 +RHEL_RELEASE = 11 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 7034bcc..91d5fe7 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,9 +1,9 @@ -"https://gitlab.com/cki-project/kernel-ark/-/commit"/f54f0bd0d437633c66fea1cc6cdad3da0edfeaac - f54f0bd0d437633c66fea1cc6cdad3da0edfeaac arch/x86/kernel/setup.c: fixup rh_check_supported - "https://gitlab.com/cki-project/kernel-ark/-/commit"/573925f14207d57091bade7e3a8d19bcfa513fd9 573925f14207d57091bade7e3a8d19bcfa513fd9 lsm: update security_lock_kernel_down +"https://gitlab.com/cki-project/kernel-ark/-/commit"/e0bc60157415817bba8a94079770da8ac88df59c + e0bc60157415817bba8a94079770da8ac88df59c arch/x86/kernel/setup.c: fixup rh_check_supported + "https://gitlab.com/cki-project/kernel-ark/-/commit"/917edb952c84e83066447f2dae05c2a92d93c702 917edb952c84e83066447f2dae05c2a92d93c702 arch/x86: mark x86_64-v1 and x86_64-v2 processors as deprecated diff --git a/kernel.changelog b/kernel.changelog index 44062eb..63e9bd3 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,8 +1,13 @@ -* Mon Mar 18 2024 Fedora Kernel Team [6.9.0-0.rc0.f6cef5f8c37f.10] -- arch/x86/kernel/setup.c: fixup rh_check_supported (Scott Weaver) +* Tue Mar 19 2024 Fedora Kernel Team [6.9.0-0.rc0.b3603fcb79b1.11] - Add new of_test module to mod-internal.list (Thorsten Leemhuis) - Add new string kunit modules to mod-internal.list (Thorsten Leemhuis) -- Add drm_gem_shmem_test to mod-internal.list (Thorsten Leemhuis) +Resolves: + +* Tue Mar 19 2024 Fedora Kernel Team [6.9.0-0.rc0.b3603fcb79b1.10] +- redhat/kernel.spec.template: enable cross for base/RT (Peter Robinson) +- redhat/kernel.spec.template: Fix cross compiling (Peter Robinson) +- arch/x86/kernel/setup.c: fixup rh_check_supported (Scott Weaver) +- Linux v6.9.0-0.rc0.b3603fcb79b1 Resolves: * Mon Mar 18 2024 Fedora Kernel Team [6.9.0-0.rc0.f6cef5f8c37f.9] diff --git a/kernel.spec b/kernel.spec index 535335e..96acb08 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.9.0 %define specversion 6.9.0 %define patchversion 6.9 -%define pkgrelease 0.rc0.20240318gitf6cef5f8c37f.10 +%define pkgrelease 0.rc0.20240319gitb3603fcb79b1.11 %define kversion 6 -%define tarfile_release 6.8-11409-gf6cef5f8c37f +%define tarfile_release 6.8-11567-gb3603fcb79b1 # This is needed to do merge window version magic %define patchlevel 9 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc0.20240318gitf6cef5f8c37f.10%{?buildid}%{?dist} +%define specrelease 0.rc0.20240319gitb3603fcb79b1.11%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.9.0 @@ -391,8 +391,6 @@ Summary: The Linux kernel %define with_bpftool 0 %define with_kernel_abi_stablelists 0 %define with_selftests 0 -%define with_cross 0 -%define with_cross_headers 0 %define with_ipaclones 0 %endif @@ -422,8 +420,6 @@ Summary: The Linux kernel %define with_bpftool 0 %define with_kernel_abi_stablelists 0 %define with_selftests 0 -%define with_cross 0 -%define with_cross_headers 0 %define with_ipaclones 0 %define with_headers 0 %define with_efiuki 0 @@ -2484,7 +2480,7 @@ BuildKernel() { fi # build and copy the vmlinux-gdb plugin files into kernel-debuginfo - %{make} %{?_smp_mflags} scripts_gdb + %{make} ARCH=$Arch %{?_smp_mflags} scripts_gdb cp -a --parents scripts/gdb/{,linux/}*.py $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer # this should be a relative symlink (Kbuild creates an absolute one) ln -s scripts/gdb/vmlinux-gdb.py $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer/vmlinux-gdb.py @@ -3961,11 +3957,15 @@ fi\ # # %changelog -* Mon Mar 18 2024 Fedora Kernel Team [6.9.0-0.rc0.f6cef5f8c37f.10] -- arch/x86/kernel/setup.c: fixup rh_check_supported (Scott Weaver) +* Tue Mar 19 2024 Fedora Kernel Team [6.9.0-0.rc0.b3603fcb79b1.11] - Add new of_test module to mod-internal.list (Thorsten Leemhuis) - Add new string kunit modules to mod-internal.list (Thorsten Leemhuis) -- Add drm_gem_shmem_test to mod-internal.list (Thorsten Leemhuis) + +* Tue Mar 19 2024 Fedora Kernel Team [6.9.0-0.rc0.b3603fcb79b1.10] +- redhat/kernel.spec.template: enable cross for base/RT (Peter Robinson) +- redhat/kernel.spec.template: Fix cross compiling (Peter Robinson) +- arch/x86/kernel/setup.c: fixup rh_check_supported (Scott Weaver) +- Linux v6.9.0-0.rc0.b3603fcb79b1 * Mon Mar 18 2024 Fedora Kernel Team [6.9.0-0.rc0.f6cef5f8c37f.9] - Linux v6.9.0-0.rc0.f6cef5f8c37f diff --git a/mod-internal.list b/mod-internal.list index cec0f73..849bd9f 100644 --- a/mod-internal.list +++ b/mod-internal.list @@ -36,7 +36,6 @@ handshake-test hashtable_test hid-uclogic-test iio-test-format -iio-test-gts iio-test-rescale input_test is_signed_type_kunit diff --git a/patch-6.9-redhat.patch b/patch-6.9-redhat.patch index aa9d89a..edb2feb 100644 --- a/patch-6.9-redhat.patch +++ b/patch-6.9-redhat.patch @@ -74,10 +74,10 @@ 73 files changed, 2147 insertions(+), 207 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 62feb8f31381..75d0d2a7eca4 100644 +index bb884c14b2f6..2939d792fecd 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -6864,6 +6864,15 @@ +@@ -6880,6 +6880,15 @@ unknown_nmi_panic [X86] Cause panic on unknown NMI. @@ -2351,10 +2351,10 @@ index d59b0947fba0..8b1e2e71d485 100644 enum efi_secureboot_mode efi_get_secureboot_mode(efi_get_variable_t *get_var) { diff --git a/include/linux/kernel.h b/include/linux/kernel.h -index d718fbec72dd..b5736cbff0a1 100644 +index be2e8c0a187e..114e213c89e2 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h -@@ -401,4 +401,20 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } +@@ -402,4 +402,20 @@ static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { } /* OTHER_WRITABLE? Generally considered a bad idea. */ \ BUILD_BUG_ON_ZERO((perms) & 2) + \ (perms)) diff --git a/sources b/sources index 48d7419..b1d72be 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.8-11409-gf6cef5f8c37f.tar.xz) = 61246dbbabab522d7a839029c372556eaec052748d52aebf636cac7be25667445a1e9f7735e661d80a6d224c33ef821d5f2597a777c50b001ce71049b597ea16 -SHA512 (kernel-abi-stablelists-6.9.0.tar.xz) = 999965fd84dcdcdcfb8434fac0bcae54b03cba2f8bc9ce330245b53e3d34a17fb93dc22330fd739732b6484bf847dbc79951eb97a68a8d580a50e00d935c93b6 -SHA512 (kernel-kabi-dw-6.9.0.tar.xz) = 2db9325a897f7ab2a1180d7c3b1a324b615636f5cd7ed69743191106c49cb213ae05cbfbe80d3f6a37b8c73b866e86874706cfa7f4698f9b6493e208ed9c8c0a +SHA512 (linux-6.8-11567-gb3603fcb79b1.tar.xz) = e4a9ff629bd7fadcfd81b72cf6487751e97d921481f8ae3ef4f17c4406a15daf7d4d846f8c7fe52049c4c2f257411cc675cbedbcebc46bf27770ca7e1f5cd756 +SHA512 (kernel-abi-stablelists-6.9.0.tar.xz) = 74ac5dabbb6bc8f830233fc7ab5a3c08133e233284ea14ab11da64a01a75d5cf1ca0905eda9e6660f8213b581490e5dc0e8140efd64a9244cac4369efb44d067 +SHA512 (kernel-kabi-dw-6.9.0.tar.xz) = cd0fea74dcc244e0d848a59f93589beb6ba7f7d05b2474930b50a8b179277904a380d65163dd8dc9c1450a08c9fcc412186735b57b23b19eb3cb49ebfce33efb