diff --git a/Makefile.rhelver b/Makefile.rhelver index 66dd6c7..2d435be 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 = 33 +RHEL_RELEASE = 35 # # RHEL_REBASE_NUM diff --git a/kernel.changelog b/kernel.changelog index 1bb470f..471d259 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,14 @@ +* Sat Apr 13 2024 Fedora Kernel Team [6.9.0-0.rc3.8f2c057754b2.35] +- docs: point out that python3-pyyaml is now required (Thorsten Leemhuis) +- Linux v6.9.0-0.rc3.8f2c057754b2 +Resolves: + +* Fri Apr 12 2024 Fedora Kernel Team [6.9.0-0.rc3.586b5dfb51b9.34] +- Use LLVM=1 for clang_lto build (Nikita Popov) +- redhat: fix def_variants.yaml check (Jan Stancek) +- Linux v6.9.0-0.rc3.586b5dfb51b9 +Resolves: + * Thu Apr 11 2024 Fedora Kernel Team [6.9.0-0.rc3.e8c39d0f57f3.33] - redhat: sanity check yaml files (Jan Stancek) - spec: rework filter-mods and mod-denylist (Jan Stancek) diff --git a/kernel.spec b/kernel.spec index 3ceac93..cd6fef0 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.rc3.20240411gite8c39d0f57f3.33 +%define pkgrelease 0.rc3.20240413git8f2c057754b2.35 %define kversion 6 -%define tarfile_release 6.9-rc3-73-ge8c39d0f57f3 +%define tarfile_release 6.9-rc3-344-g8f2c057754b2 # This is needed to do merge window version magic %define patchlevel 9 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.20240411gite8c39d0f57f3.33%{?buildid}%{?dist} +%define specrelease 0.rc3.20240413git8f2c057754b2.35%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.9.0 @@ -320,7 +320,8 @@ Summary: The Linux kernel %endif %global clang_make_opts HOSTCC=clang CC=clang LLVM_IAS=%{llvm_ias} %if %{with clang_lto} -%global clang_make_opts %{clang_make_opts} LD=ld.lld HOSTLD=ld.lld AR=llvm-ar NM=llvm-nm HOSTAR=llvm-ar HOSTNM=llvm-nm +# LLVM=1 enables use of all LLVM tools. +%global clang_make_opts %{clang_make_opts} LLVM=1 %endif %global make_opts %{make_opts} %{clang_make_opts} # clang does not support the -fdump-ipa-clones option @@ -3934,6 +3935,15 @@ fi\ # # %changelog +* Sat Apr 13 2024 Fedora Kernel Team [6.9.0-0.rc3.8f2c057754b2.35] +- docs: point out that python3-pyyaml is now required (Thorsten Leemhuis) +- Linux v6.9.0-0.rc3.8f2c057754b2 + +* Fri Apr 12 2024 Fedora Kernel Team [6.9.0-0.rc3.586b5dfb51b9.34] +- Use LLVM=1 for clang_lto build (Nikita Popov) +- redhat: fix def_variants.yaml check (Jan Stancek) +- Linux v6.9.0-0.rc3.586b5dfb51b9 + * Thu Apr 11 2024 Fedora Kernel Team [6.9.0-0.rc3.e8c39d0f57f3.33] - redhat: sanity check yaml files (Jan Stancek) - spec: rework filter-mods and mod-denylist (Jan Stancek) diff --git a/patch-6.9-redhat.patch b/patch-6.9-redhat.patch index 2932bb5..90ef9c7 100644 --- a/patch-6.9-redhat.patch +++ b/patch-6.9-redhat.patch @@ -742,7 +742,7 @@ index 1687483ff319..390b67f19181 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index 7c157bf92695..aa186a7dfb43 100644 +index d1464324de95..a3b2f99a2d78 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1798,6 +1798,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) @@ -1873,10 +1873,10 @@ index af2996d0d17f..75d5971b9025 100644 if (!rc) return rc; diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index bf4833221816..b8574e70160d 100644 +index eff7f5df08e2..b58145ce7775 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -4441,6 +4441,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, +@@ -4433,6 +4433,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9084, quirk_bridge_cavm_thrx2_pcie_root); diff --git a/sources b/sources index 4289a83..c2e2509 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.9-rc3-73-ge8c39d0f57f3.tar.xz) = 5321aef616c78b891209d73c035f9e381d7938b000ccb5dd87c9bbbca8be843fcb61736e3936d2c95e8aaf0a5134a587ae3601a671bc13c98bb82fe5ee60b7b3 -SHA512 (kernel-abi-stablelists-6.9.0.tar.xz) = bd55f3c79171d10900344327e7d5ce8d970e5fdbcd8307d6ebe2312b8aa3bd9c745d86f68dcef2b09084c31c714000dd0b36b91a37f31622151582194d9f35e4 -SHA512 (kernel-kabi-dw-6.9.0.tar.xz) = a04f8fd80138228ef1c84caa2a942c177e41dbd9c404caa3f2efac5c3b1bb882b94186dc13eb56f6426a2e02e9d0deb15f7b3f741b716199487aad0c68f05457 +SHA512 (linux-6.9-rc3-344-g8f2c057754b2.tar.xz) = 265b80957038d7af3c239c52fa6f7fa3d6f6e0b9f84bdb9b89182f6c8c23d6bc7dec1c9b27aaf403adefed3b31d6931c46bed8d4c98c567452264f1b76a44f82 +SHA512 (kernel-abi-stablelists-6.9.0.tar.xz) = 5da6c625141c149f21caf0854a7f8faf9dc8688234845be274b18ba2350c624a956e9e1e011208b021c2eb42699e05143cdb3eb96348cc1766583958accdbb3d +SHA512 (kernel-kabi-dw-6.9.0.tar.xz) = 7d8bf9c1ee0dc2c77699336ae49cc284feb7c8a43cc62b1ce8bc621537287c424328278ef381cf921c35c8b289eba30f921222c3fdd7f891eabf02881c5c19a3