From 37c1266e53bc8512b5ef98152407ff4d7a8e9112 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 4 Jun 2024 12:12:32 -0500 Subject: [PATCH] kernel-6.10.0-0.rc2.20240604git2ab795141095.25 * Tue Jun 04 2024 Fedora Kernel Team [6.10.0-0.rc2.2ab795141095.25] - redhat/configs: Move CONFIG_BLK_CGROUP_IOCOST=y to common/generic (Waiman Long) - Turn on CONFIG_MFD_QCOM_PM8008 for Fedora aarch64 (Justin M. Forbes) - Linux v6.10.0-0.rc2.2ab795141095 Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-16k-debug-fedora.config | 2 +- kernel-aarch64-16k-fedora.config | 2 +- kernel-aarch64-64k-debug-rhel.config | 2 +- kernel-aarch64-64k-rhel.config | 2 +- kernel-aarch64-debug-fedora.config | 2 +- kernel-aarch64-debug-rhel.config | 2 +- kernel-aarch64-fedora.config | 2 +- kernel-aarch64-rhel.config | 2 +- kernel-aarch64-rt-debug-rhel.config | 2 +- kernel-aarch64-rt-rhel.config | 2 +- kernel-ppc64le-debug-rhel.config | 2 +- kernel-ppc64le-rhel.config | 2 +- kernel-s390x-debug-rhel.config | 2 +- kernel-s390x-rhel.config | 2 +- kernel-s390x-zfcpdump-rhel.config | 2 +- kernel-x86_64-debug-rhel.config | 2 +- kernel-x86_64-rhel.config | 2 +- kernel-x86_64-rt-debug-rhel.config | 2 +- kernel-x86_64-rt-rhel.config | 2 +- kernel.changelog | 6 ++++++ kernel.spec | 11 ++++++++--- sources | 6 +++--- 23 files changed, 37 insertions(+), 26 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 47598f6b1..96c4e2660 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 = 24 +RHEL_RELEASE = 25 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index 7033d1fbe..1ef1462e5 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -4492,7 +4492,7 @@ CONFIG_MFD_MAX77714=m # CONFIG_MFD_PALMAS is not set # CONFIG_MFD_PCF50633 is not set # CONFIG_MFD_PM8XXX is not set -# CONFIG_MFD_QCOM_PM8008 is not set +CONFIG_MFD_QCOM_PM8008=m # CONFIG_MFD_QCOM_RPM is not set # CONFIG_MFD_RC5T583 is not set # CONFIG_MFD_RDC321X is not set diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index f7b9c1633..f89965268 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -4467,7 +4467,7 @@ CONFIG_MFD_MAX77714=m # CONFIG_MFD_PALMAS is not set # CONFIG_MFD_PCF50633 is not set # CONFIG_MFD_PM8XXX is not set -# CONFIG_MFD_QCOM_PM8008 is not set +CONFIG_MFD_QCOM_PM8008=m # CONFIG_MFD_QCOM_RPM is not set # CONFIG_MFD_RC5T583 is not set # CONFIG_MFD_RDC321X is not set diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index b105c815d..bf9a62cca 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -600,7 +600,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BITFIELD_KUNIT=m CONFIG_BITS_TEST=m CONFIG_BLK_CGROUP_FC_APPID=y -# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_CGROUP=y diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 5abb3664b..4d0fab477 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -600,7 +600,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BITFIELD_KUNIT=m CONFIG_BITS_TEST=m CONFIG_BLK_CGROUP_FC_APPID=y -# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_CGROUP=y diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 0643d9f1a..552934c97 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -4492,7 +4492,7 @@ CONFIG_MFD_MAX77714=m # CONFIG_MFD_PALMAS is not set # CONFIG_MFD_PCF50633 is not set # CONFIG_MFD_PM8XXX is not set -# CONFIG_MFD_QCOM_PM8008 is not set +CONFIG_MFD_QCOM_PM8008=m # CONFIG_MFD_QCOM_RPM is not set # CONFIG_MFD_RC5T583 is not set # CONFIG_MFD_RDC321X is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 5dee9b41f..ef829d73f 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -598,7 +598,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BITFIELD_KUNIT=m CONFIG_BITS_TEST=m CONFIG_BLK_CGROUP_FC_APPID=y -# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_CGROUP=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 75ac3d740..e9d817d68 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -4467,7 +4467,7 @@ CONFIG_MFD_MAX77714=m # CONFIG_MFD_PALMAS is not set # CONFIG_MFD_PCF50633 is not set # CONFIG_MFD_PM8XXX is not set -# CONFIG_MFD_QCOM_PM8008 is not set +CONFIG_MFD_QCOM_PM8008=m # CONFIG_MFD_QCOM_RPM is not set # CONFIG_MFD_RC5T583 is not set # CONFIG_MFD_RDC321X is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index cf5d8ef51..eb235514b 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -598,7 +598,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BITFIELD_KUNIT=m CONFIG_BITS_TEST=m CONFIG_BLK_CGROUP_FC_APPID=y -# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_CGROUP=y diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index 107e08e23..35a027b78 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -598,7 +598,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BITFIELD_KUNIT=m CONFIG_BITS_TEST=m CONFIG_BLK_CGROUP_FC_APPID=y -# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_CGROUP=y diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index 40499ebe1..34ed732f7 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -598,7 +598,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BITFIELD_KUNIT=m CONFIG_BITS_TEST=m CONFIG_BLK_CGROUP_FC_APPID=y -# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_CGROUP=y diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 53a39e1a8..07c921b43 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -454,7 +454,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BITFIELD_KUNIT=m CONFIG_BITS_TEST=m CONFIG_BLK_CGROUP_FC_APPID=y -# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_CGROUP=y diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 18c22dd55..d9432c216 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -454,7 +454,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BITFIELD_KUNIT=m CONFIG_BITS_TEST=m CONFIG_BLK_CGROUP_FC_APPID=y -# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_CGROUP=y diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index eb34a542c..d70e1c8bf 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -453,7 +453,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BITFIELD_KUNIT=m CONFIG_BITS_TEST=m CONFIG_BLK_CGROUP_FC_APPID=y -# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_CGROUP=y diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 20188b40b..7f8a497b2 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -453,7 +453,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BITFIELD_KUNIT=m CONFIG_BITS_TEST=m CONFIG_BLK_CGROUP_FC_APPID=y -# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_CGROUP=y diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index b7ff4e9d9..8939474b8 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -454,7 +454,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BITFIELD_KUNIT=m CONFIG_BITS_TEST=m CONFIG_BLK_CGROUP_FC_APPID=y -# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_CGROUP=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index ef56a7305..95c627b8b 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -482,7 +482,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BITFIELD_KUNIT=m CONFIG_BITS_TEST=m CONFIG_BLK_CGROUP_FC_APPID=y -# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_CGROUP=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 5e3955f03..9a2981b7a 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -482,7 +482,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BITFIELD_KUNIT=m CONFIG_BITS_TEST=m CONFIG_BLK_CGROUP_FC_APPID=y -# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_CGROUP=y diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 1a88ced45..749d0294e 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -482,7 +482,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BITFIELD_KUNIT=m CONFIG_BITS_TEST=m CONFIG_BLK_CGROUP_FC_APPID=y -# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_CGROUP=y diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index df9cb8e50..b4883c3a6 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -482,7 +482,7 @@ CONFIG_BINFMT_SCRIPT=y CONFIG_BITFIELD_KUNIT=m CONFIG_BITS_TEST=m CONFIG_BLK_CGROUP_FC_APPID=y -# CONFIG_BLK_CGROUP_IOCOST is not set +CONFIG_BLK_CGROUP_IOCOST=y CONFIG_BLK_CGROUP_IOLATENCY=y # CONFIG_BLK_CGROUP_IOPRIO is not set CONFIG_BLK_CGROUP=y diff --git a/kernel.changelog b/kernel.changelog index 39ffc9381..0f0b602c1 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,9 @@ +* Tue Jun 04 2024 Fedora Kernel Team [6.10.0-0.rc2.2ab795141095.25] +- redhat/configs: Move CONFIG_BLK_CGROUP_IOCOST=y to common/generic (Waiman Long) +- Turn on CONFIG_MFD_QCOM_PM8008 for Fedora aarch64 (Justin M. Forbes) +- Linux v6.10.0-0.rc2.2ab795141095 +Resolves: + * Mon Jun 03 2024 Fedora Kernel Team [6.10.0-0.rc2.24] - Linux v6.10.0-0.rc2 Resolves: diff --git a/kernel.spec b/kernel.spec index 09d4ce3d2..568515e0c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.10.0 %define specversion 6.10.0 %define patchversion 6.10 -%define pkgrelease 0.rc2.24 +%define pkgrelease 0.rc2.20240604git2ab795141095.25 %define kversion 6 -%define tarfile_release 6.10-rc2 +%define tarfile_release 6.10-rc2-10-g2ab795141095 # This is needed to do merge window version magic %define patchlevel 10 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.24%{?buildid}%{?dist} +%define specrelease 0.rc2.20240604git2ab795141095.25%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.10.0 @@ -4017,6 +4017,11 @@ fi\ # # %changelog +* Tue Jun 04 2024 Fedora Kernel Team [6.10.0-0.rc2.2ab795141095.25] +- redhat/configs: Move CONFIG_BLK_CGROUP_IOCOST=y to common/generic (Waiman Long) +- Turn on CONFIG_MFD_QCOM_PM8008 for Fedora aarch64 (Justin M. Forbes) +- Linux v6.10.0-0.rc2.2ab795141095 + * Mon Jun 03 2024 Fedora Kernel Team [6.10.0-0.rc2.24] - Linux v6.10.0-0.rc2 diff --git a/sources b/sources index 849e4a19c..42ebc9e70 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.10-rc2.tar.xz) = 6c943d2b0fd94972c5388451af4aa000bc42d56de27c99aff6aa793895744208765175b08c42ea75f66e47271e942b8fea235e902f764b6623f8ad458f311258 -SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = e3deb96f000ba1734f4727653bb6a39d1ca43ccc7e5fdbf15657d265effd198829d9ec78d91a03ef92404e4dcbb55f5dbb4ae01f649d3f1cf9c2d222722564d2 -SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 7c150eefca22cc1a4b806e017d254bd88ea037f64f6cc84a3c3edec4c3884021b67875a5c802570be406d7cd7881f2f89a5e3370f2fe5863e3267820f5ed556c +SHA512 (linux-6.10-rc2-10-g2ab795141095.tar.xz) = 73037665471811f60e1f1bc5b511409ea236093f716a82b6095c25fa73ba923908887963533570bd9d421f6b6c1c855b32916176b5e49a36e9b62352d1fbfc05 +SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = 168a8f95f8e6ad4a21aa788f6b2d807d7a222a24d26c36608db898a0827a5ea48464571fed199110054c4bf9cfa731e38e447687d6adb833b18371251ee6be33 +SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 92749af8d53a80ab04fe9761477b83b01b4d752fe3085a70e3fd2f54b41758200b19f626e3d3787a637ee2b20e7190c4dd180b9de1a42f24a107e3d7fdc9a293