From e8025dc0fba7e18c74f529a93d653c71d16e5a56 Mon Sep 17 00:00:00 2001 From: Patrick Talbert Date: Wed, 27 Mar 2024 18:01:14 +0100 Subject: [PATCH] kernel-6.9.0-0.rc1.20240327git7033999ecd7b.18 * Wed Mar 27 2024 Fedora Kernel Team [6.9.0-0.rc1.7033999ecd7b.18] - kernel.spec: fix libperf-debuginfo content (Jan Stancek) - Turn on DM_VDO for Fedora (Justin M. Forbes) - redhat: make libperf-devel require libperf %%{version}-%%{release} (Jan Stancek) - kernel.spec: drop custom mode also for System.map ghost entry (Jan Stancek) - Octopus merges are too conservative, serialize instead (Don Zickus) - Add tracking branches for rt-devel (Don Zickus) - Linux v6.9.0-0.rc1.7033999ecd7b Resolves: Signed-off-by: Patrick Talbert --- Makefile.rhelver | 2 +- kernel-aarch64-16k-debug-fedora.config | 2 +- kernel-aarch64-16k-fedora.config | 2 +- kernel-aarch64-debug-fedora.config | 2 +- kernel-aarch64-fedora.config | 2 +- kernel-ppc64le-debug-fedora.config | 2 +- kernel-ppc64le-fedora.config | 2 +- kernel-s390x-debug-fedora.config | 2 +- kernel-s390x-fedora.config | 2 +- kernel-x86_64-debug-fedora.config | 2 +- kernel-x86_64-fedora.config | 2 +- kernel.changelog | 10 ++++++++++ kernel.spec | 20 +++++++++++++++----- sources | 6 +++--- 14 files changed, 39 insertions(+), 19 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index cb2beaa85..7db7c7804 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 = 17 +RHEL_RELEASE = 18 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index a50566e32..d3c4bd7e8 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -1899,7 +1899,7 @@ CONFIG_DM_SWITCH=m CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_UEVENT=y CONFIG_DM_UNSTRIPED=m -# CONFIG_DM_VDO is not set +CONFIG_DM_VDO=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_VERITY=m CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index bc6c45e9a..76fb65a74 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -1890,7 +1890,7 @@ CONFIG_DM_SWITCH=m CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_UEVENT=y CONFIG_DM_UNSTRIPED=m -# CONFIG_DM_VDO is not set +CONFIG_DM_VDO=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_VERITY=m CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 16c4fd424..02dc5d293 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -1899,7 +1899,7 @@ CONFIG_DM_SWITCH=m CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_UEVENT=y CONFIG_DM_UNSTRIPED=m -# CONFIG_DM_VDO is not set +CONFIG_DM_VDO=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_VERITY=m CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index b926522ba..fd331e422 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -1890,7 +1890,7 @@ CONFIG_DM_SWITCH=m CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_UEVENT=y CONFIG_DM_UNSTRIPED=m -# CONFIG_DM_VDO is not set +CONFIG_DM_VDO=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_VERITY=m CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 6a93abaed..5abd3d969 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -1436,7 +1436,7 @@ CONFIG_DM_SWITCH=m CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_UEVENT=y CONFIG_DM_UNSTRIPED=m -# CONFIG_DM_VDO is not set +CONFIG_DM_VDO=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_VERITY=m CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index cb1a8ad9b..bf44a2793 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -1425,7 +1425,7 @@ CONFIG_DM_SWITCH=m CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_UEVENT=y CONFIG_DM_UNSTRIPED=m -# CONFIG_DM_VDO is not set +CONFIG_DM_VDO=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_VERITY=m CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 0ea5220a9..a86983a7b 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1441,7 +1441,7 @@ CONFIG_DM_SWITCH=m CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_UEVENT=y CONFIG_DM_UNSTRIPED=m -# CONFIG_DM_VDO is not set +CONFIG_DM_VDO=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_VERITY=m CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index e208642b1..d0aecd30c 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -1430,7 +1430,7 @@ CONFIG_DM_SWITCH=m CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_UEVENT=y CONFIG_DM_UNSTRIPED=m -# CONFIG_DM_VDO is not set +CONFIG_DM_VDO=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_VERITY=m CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index ae8fdb369..3cd47a691 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -1570,7 +1570,7 @@ CONFIG_DM_SWITCH=m CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_UEVENT=y CONFIG_DM_UNSTRIPED=m -# CONFIG_DM_VDO is not set +CONFIG_DM_VDO=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_VERITY=m CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index ee5294b40..72f014980 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -1559,7 +1559,7 @@ CONFIG_DM_SWITCH=m CONFIG_DM_THIN_PROVISIONING=m CONFIG_DM_UEVENT=y CONFIG_DM_UNSTRIPED=m -# CONFIG_DM_VDO is not set +CONFIG_DM_VDO=m CONFIG_DM_VERITY_FEC=y CONFIG_DM_VERITY=m CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG_SECONDARY_KEYRING=y diff --git a/kernel.changelog b/kernel.changelog index 7df4ee1cc..273f6abee 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,13 @@ +* Wed Mar 27 2024 Fedora Kernel Team [6.9.0-0.rc1.7033999ecd7b.18] +- kernel.spec: fix libperf-debuginfo content (Jan Stancek) +- Turn on DM_VDO for Fedora (Justin M. Forbes) +- redhat: make libperf-devel require libperf %%{version}-%%{release} (Jan Stancek) +- kernel.spec: drop custom mode also for System.map ghost entry (Jan Stancek) +- Octopus merges are too conservative, serialize instead (Don Zickus) +- Add tracking branches for rt-devel (Don Zickus) +- Linux v6.9.0-0.rc1.7033999ecd7b +Resolves: + * Tue Mar 26 2024 Fedora Kernel Team [6.9.0-0.rc1.928a87efa423.17] - all: clean-up i915 (Peter Robinson) - Turn on CONFIG_READ_ONLY_THP_FOR_FS for Fedora (Justin M. Forbes) diff --git a/kernel.spec b/kernel.spec index c62410ac1..728299e51 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.rc1.20240326git928a87efa423.17 +%define pkgrelease 0.rc1.20240327git7033999ecd7b.18 %define kversion 6 -%define tarfile_release 6.9-rc1-5-g928a87efa423 +%define tarfile_release 6.9-rc1-9-g7033999ecd7b # This is needed to do merge window version magic %define patchlevel 9 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.20240326git928a87efa423.17%{?buildid}%{?dist} +%define specrelease 0.rc1.20240327git7033999ecd7b.18%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.9.0 @@ -1129,6 +1129,7 @@ This package contains the kernel source perf library. %package -n libperf-devel Summary: Developement files for the perf library from kernel source +Requires: libperf = %{version}-%{release} %description -n libperf-devel This package includes libraries and header files needed for development of applications which use perf library from kernel source. @@ -1145,7 +1146,7 @@ This package provides debug information for the libperf package. # 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 '.*%%{_libdir}/libperf.so(\.debug)?|XXX' -o libperf-debuginfo.list} +%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_libdir}/libperf.so.*(\.debug)?|XXX' -o libperf-debuginfo.list} # with_libperf %endif @@ -3818,7 +3819,7 @@ fi\ %ghost /%{image_install_path}/dtb-%{KVERREL}%{?3:+%{3}} \ %endif\ /lib/modules/%{KVERREL}%{?3:+%{3}}/System.map\ -%ghost %attr(0600, root, root) /boot/System.map-%{KVERREL}%{?3:+%{3}}\ +%ghost /boot/System.map-%{KVERREL}%{?3:+%{3}}\ %dir /lib/modules\ %dir /lib/modules/%{KVERREL}%{?3:+%{3}}\ /lib/modules/%{KVERREL}%{?3:+%{3}}/symvers.%compext\ @@ -3957,6 +3958,15 @@ fi\ # # %changelog +* Wed Mar 27 2024 Fedora Kernel Team [6.9.0-0.rc1.7033999ecd7b.18] +- kernel.spec: fix libperf-debuginfo content (Jan Stancek) +- Turn on DM_VDO for Fedora (Justin M. Forbes) +- redhat: make libperf-devel require libperf %%{version}-%%{release} (Jan Stancek) +- kernel.spec: drop custom mode also for System.map ghost entry (Jan Stancek) +- Octopus merges are too conservative, serialize instead (Don Zickus) +- Add tracking branches for rt-devel (Don Zickus) +- Linux v6.9.0-0.rc1.7033999ecd7b + * Tue Mar 26 2024 Fedora Kernel Team [6.9.0-0.rc1.928a87efa423.17] - all: clean-up i915 (Peter Robinson) - Turn on CONFIG_READ_ONLY_THP_FOR_FS for Fedora (Justin M. Forbes) diff --git a/sources b/sources index 2f1d85997..14b40f111 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-rc1-5-g928a87efa423.tar.xz) = 7e1b036b1d4c111647408224ed59afd2d6600aa20f19b0471a3aee7b280ca7a572fe383c58f6d07e5f8dbeabe8081b93737795e56f88ad6552f2ac8a40772d26 -SHA512 (kernel-abi-stablelists-6.9.0.tar.xz) = c0849088a081f76e8fac8031644c0d1cec6fad4b2b23ed78070193db07f334a7576edf2072c88bc6e1f96761e587dad8d4f9c607da8f1e6b17a52dac97dcc5fc -SHA512 (kernel-kabi-dw-6.9.0.tar.xz) = 2978c8e96750604883ede19dabcfb69c59a1f919440a47f89143efe525891a9c720b7f1a592021479b0deb5a220a45d8d94511100e83825ed6b6060593ce3e09 +SHA512 (linux-6.9-rc1-9-g7033999ecd7b.tar.xz) = 2e313ff864e9eb11b64dae93e2314d15262cf26e67bb40cd3b2651601764b0abb8a92cd8b583c4bf7628cd692d5bce77ad3d39fe05d37eeeee47c59f2344d18c +SHA512 (kernel-abi-stablelists-6.9.0.tar.xz) = b14b0b2032d8d5f4808dad2d90a6f4d9c3bb95e2c66802b3b660a27c42a8da01e5ca1bb3c2beb58573dc79a51a8172f354456e43224bbdeb7f67001e77df1289 +SHA512 (kernel-kabi-dw-6.9.0.tar.xz) = 70af6501da31b7f97ed62c480faec6ee60627da673247754c6c7a5fb2ab0f105759252be7d96c384c477fca9195b81cc850abe678c5058a944ff9ec42d458152