From b072c6fe6959e7848b2c88bb32a349d5eba64e3e Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 8 Aug 2023 11:40:53 -0500 Subject: [PATCH] kernel-6.5.0-0.rc5.20230808git14f9643dc90a.37 * Tue Aug 08 2023 Fedora Kernel Team [6.5.0-0.rc5.14f9643dc90a.37.el127] - redhat/configs: Texas Instruments INA3221 driver (Steve Best) - Linux v6.5.0-0.rc5.14f9643dc90a Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-64k-debug-rhel.config | 4 ++-- kernel-aarch64-64k-rhel.config | 4 ++-- kernel-aarch64-debug-rhel.config | 4 ++-- kernel-aarch64-rhel.config | 4 ++-- kernel-aarch64-rt-debug-rhel.config | 4 ++-- kernel-aarch64-rt-rhel.config | 4 ++-- 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.spec | 10 +++++++--- sources | 6 +++--- 18 files changed, 32 insertions(+), 28 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index cb5bf1f10..1a1e2ffbd 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 = 36 +RHEL_RELEASE = 37 # # RHEL_REBASE_NUM diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index 414c83f21..40bbc7a3a 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -2335,7 +2335,7 @@ CONFIG_HW_RANDOM_CAVIUM=m # CONFIG_HW_RANDOM_CCTRNG is not set CONFIG_HW_RANDOM_CN10K=m CONFIG_HW_RANDOM_HISI=y -CONFIG_HW_RANDOM_HISTB=y +# CONFIG_HW_RANDOM_HISTB is not set # CONFIG_HW_RANDOM_IPROC_RNG200 is not set CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y @@ -5487,7 +5487,7 @@ CONFIG_SENSORS_G762=m # CONFIG_SENSORS_INA209 is not set # CONFIG_SENSORS_INA238 is not set # CONFIG_SENSORS_INA2XX is not set -# CONFIG_SENSORS_INA3221 is not set +CONFIG_SENSORS_INA3221=m # CONFIG_SENSORS_INSPUR_IPSPS is not set CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m # CONFIG_SENSORS_IR35221 is not set diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 7815672c7..e3d6b94ce 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -2319,7 +2319,7 @@ CONFIG_HW_RANDOM_CAVIUM=m # CONFIG_HW_RANDOM_CCTRNG is not set CONFIG_HW_RANDOM_CN10K=m CONFIG_HW_RANDOM_HISI=y -CONFIG_HW_RANDOM_HISTB=y +# CONFIG_HW_RANDOM_HISTB is not set # CONFIG_HW_RANDOM_IPROC_RNG200 is not set CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y @@ -5464,7 +5464,7 @@ CONFIG_SENSORS_G762=m # CONFIG_SENSORS_INA209 is not set # CONFIG_SENSORS_INA238 is not set # CONFIG_SENSORS_INA2XX is not set -# CONFIG_SENSORS_INA3221 is not set +CONFIG_SENSORS_INA3221=m # CONFIG_SENSORS_INSPUR_IPSPS is not set CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m # CONFIG_SENSORS_IR35221 is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 4dea68e5e..6c17f3627 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -2331,7 +2331,7 @@ CONFIG_HW_RANDOM_CAVIUM=m # CONFIG_HW_RANDOM_CCTRNG is not set CONFIG_HW_RANDOM_CN10K=m CONFIG_HW_RANDOM_HISI=y -CONFIG_HW_RANDOM_HISTB=y +# CONFIG_HW_RANDOM_HISTB is not set # CONFIG_HW_RANDOM_IPROC_RNG200 is not set CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y @@ -5483,7 +5483,7 @@ CONFIG_SENSORS_G762=m # CONFIG_SENSORS_INA209 is not set # CONFIG_SENSORS_INA238 is not set # CONFIG_SENSORS_INA2XX is not set -# CONFIG_SENSORS_INA3221 is not set +CONFIG_SENSORS_INA3221=m # CONFIG_SENSORS_INSPUR_IPSPS is not set CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m # CONFIG_SENSORS_IR35221 is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 125a05a62..466c183b5 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -2315,7 +2315,7 @@ CONFIG_HW_RANDOM_CAVIUM=m # CONFIG_HW_RANDOM_CCTRNG is not set CONFIG_HW_RANDOM_CN10K=m CONFIG_HW_RANDOM_HISI=y -CONFIG_HW_RANDOM_HISTB=y +# CONFIG_HW_RANDOM_HISTB is not set # CONFIG_HW_RANDOM_IPROC_RNG200 is not set CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y @@ -5460,7 +5460,7 @@ CONFIG_SENSORS_G762=m # CONFIG_SENSORS_INA209 is not set # CONFIG_SENSORS_INA238 is not set # CONFIG_SENSORS_INA2XX is not set -# CONFIG_SENSORS_INA3221 is not set +CONFIG_SENSORS_INA3221=m # CONFIG_SENSORS_INSPUR_IPSPS is not set CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m # CONFIG_SENSORS_IR35221 is not set diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index bfeed9144..dfdb96555 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -2421,7 +2421,7 @@ CONFIG_HW_RANDOM_CAVIUM=m # CONFIG_HW_RANDOM_CCTRNG is not set CONFIG_HW_RANDOM_CN10K=m CONFIG_HW_RANDOM_HISI=y -CONFIG_HW_RANDOM_HISTB=y +# CONFIG_HW_RANDOM_HISTB is not set # CONFIG_HW_RANDOM_IPROC_RNG200 is not set CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y @@ -5621,7 +5621,7 @@ CONFIG_SENSORS_G762=m # CONFIG_SENSORS_INA209 is not set # CONFIG_SENSORS_INA238 is not set # CONFIG_SENSORS_INA2XX is not set -# CONFIG_SENSORS_INA3221 is not set +CONFIG_SENSORS_INA3221=m # CONFIG_SENSORS_INSPUR_IPSPS is not set CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m # CONFIG_SENSORS_IR35221 is not set diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index 520218aa1..50a78eb6b 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -2405,7 +2405,7 @@ CONFIG_HW_RANDOM_CAVIUM=m # CONFIG_HW_RANDOM_CCTRNG is not set CONFIG_HW_RANDOM_CN10K=m CONFIG_HW_RANDOM_HISI=y -CONFIG_HW_RANDOM_HISTB=y +# CONFIG_HW_RANDOM_HISTB is not set # CONFIG_HW_RANDOM_IPROC_RNG200 is not set CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y @@ -5598,7 +5598,7 @@ CONFIG_SENSORS_G762=m # CONFIG_SENSORS_INA209 is not set # CONFIG_SENSORS_INA238 is not set # CONFIG_SENSORS_INA2XX is not set -# CONFIG_SENSORS_INA3221 is not set +CONFIG_SENSORS_INA3221=m # CONFIG_SENSORS_INSPUR_IPSPS is not set CONFIG_SENSORS_INTEL_M10_BMC_HWMON=m # CONFIG_SENSORS_IR35221 is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index a688ea12a..4e1648014 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -2082,7 +2082,7 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y # CONFIG_HW_RANDOM_BA431 is not set # CONFIG_HW_RANDOM_CCTRNG is not set CONFIG_HW_RANDOM_HISI=y -CONFIG_HW_RANDOM_HISTB=y +# CONFIG_HW_RANDOM_HISTB is not set CONFIG_HW_RANDOM_POWERNV=m CONFIG_HW_RANDOM_PSERIES=m CONFIG_HW_RANDOM_TIMERIOMEM=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index a8fa119e4..b820125fc 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -2066,7 +2066,7 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y # CONFIG_HW_RANDOM_BA431 is not set # CONFIG_HW_RANDOM_CCTRNG is not set CONFIG_HW_RANDOM_HISI=y -CONFIG_HW_RANDOM_HISTB=y +# CONFIG_HW_RANDOM_HISTB is not set CONFIG_HW_RANDOM_POWERNV=m CONFIG_HW_RANDOM_PSERIES=m CONFIG_HW_RANDOM_TIMERIOMEM=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 0ee6212cb..8527ce5fa 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -2075,7 +2075,7 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y # CONFIG_HW_RANDOM_BA431 is not set # CONFIG_HW_RANDOM_CCTRNG is not set CONFIG_HW_RANDOM_HISI=y -CONFIG_HW_RANDOM_HISTB=y +# CONFIG_HW_RANDOM_HISTB is not set CONFIG_HW_RANDOM_S390=y # CONFIG_HW_RANDOM_TIMERIOMEM is not set # CONFIG_HW_RANDOM_TPM is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 15e1848db..202e8f57b 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -2059,7 +2059,7 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y # CONFIG_HW_RANDOM_BA431 is not set # CONFIG_HW_RANDOM_CCTRNG is not set CONFIG_HW_RANDOM_HISI=y -CONFIG_HW_RANDOM_HISTB=y +# CONFIG_HW_RANDOM_HISTB is not set CONFIG_HW_RANDOM_S390=y # CONFIG_HW_RANDOM_TIMERIOMEM is not set # CONFIG_HW_RANDOM_TPM is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 0505ad8be..b716513f6 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -2068,7 +2068,7 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y # CONFIG_HW_RANDOM_BA431 is not set # CONFIG_HW_RANDOM_CCTRNG is not set CONFIG_HW_RANDOM_HISI=y -CONFIG_HW_RANDOM_HISTB=y +# CONFIG_HW_RANDOM_HISTB is not set CONFIG_HW_RANDOM_S390=y # CONFIG_HW_RANDOM_TIMERIOMEM is not set # CONFIG_HW_RANDOM_TPM is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 3214da8db..c28ca1564 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -2209,7 +2209,7 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y # CONFIG_HW_RANDOM_BA431 is not set # CONFIG_HW_RANDOM_CCTRNG is not set CONFIG_HW_RANDOM_HISI=y -CONFIG_HW_RANDOM_HISTB=y +# CONFIG_HW_RANDOM_HISTB is not set CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index c7251d00f..f66c82f22 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -2193,7 +2193,7 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y # CONFIG_HW_RANDOM_BA431 is not set # CONFIG_HW_RANDOM_CCTRNG is not set CONFIG_HW_RANDOM_HISI=y -CONFIG_HW_RANDOM_HISTB=y +# CONFIG_HW_RANDOM_HISTB is not set CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 2acff5fa9..691dd4cbe 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -2300,7 +2300,7 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y # CONFIG_HW_RANDOM_BA431 is not set # CONFIG_HW_RANDOM_CCTRNG is not set CONFIG_HW_RANDOM_HISI=y -CONFIG_HW_RANDOM_HISTB=y +# CONFIG_HW_RANDOM_HISTB is not set CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index ae6a0013a..3a46ebcb6 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -2284,7 +2284,7 @@ CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y # CONFIG_HW_RANDOM_BA431 is not set # CONFIG_HW_RANDOM_CCTRNG is not set CONFIG_HW_RANDOM_HISI=y -CONFIG_HW_RANDOM_HISTB=y +# CONFIG_HW_RANDOM_HISTB is not set CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_TPM=y diff --git a/kernel.spec b/kernel.spec index 1bbf44d35..c06c21103 100644 --- a/kernel.spec +++ b/kernel.spec @@ -174,13 +174,13 @@ Summary: The Linux kernel %define specrpmversion 6.5.0 %define specversion 6.5.0 %define patchversion 6.5 -%define pkgrelease 0.rc5.36 +%define pkgrelease 0.rc5.20230808git14f9643dc90a.37 %define kversion 6 -%define tarfile_release 6.5-rc5 +%define tarfile_release 6.5-rc5-29-g14f9643dc90a # This is needed to do merge window version magic %define patchlevel 5 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc5.36%{?buildid}%{?dist} +%define specrelease 0.rc5.20230808git14f9643dc90a.37%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.5.0 @@ -3740,6 +3740,10 @@ fi\ # # %changelog +* Tue Aug 08 2023 Fedora Kernel Team [6.5.0-0.rc5.14f9643dc90a.37.el127] +- redhat/configs: Texas Instruments INA3221 driver (Steve Best) +- Linux v6.5.0-0.rc5.14f9643dc90a + * Mon Aug 07 2023 Fedora Kernel Team [6.5.0-0.rc5.36.el127] - Linux v6.5.0-0.rc5 diff --git a/sources b/sources index d93056ea8..a87746145 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.5-rc5.tar.xz) = 4a6d353c54a99670150a1679c34aa30df9e26b3fa2b9c32c3521ea6f0f7ac1861306981a734ed7b6419fb630274f2f8331420bcf5f03e860eb2460e089dd11d7 -SHA512 (kernel-abi-stablelists-6.5.0.tar.bz2) = 07efaad282106ad37ffad3c1c53c496ee29bdb215f3e3d231a835e2d8774466c81b754b6703f75d9718dd598f4e719d8841de330baecc61ed0eb4c23debfc2d6 -SHA512 (kernel-kabi-dw-6.5.0.tar.bz2) = 58ce4190b1724b570b8308f4ffbc03e579d28ef6d31e576d4b3ecff0c83fe792654b125c3f553efcb0d838b6b503aa78d5e3884d3045c1aac0ced299602d1e47 +SHA512 (linux-6.5-rc5-29-g14f9643dc90a.tar.xz) = 616ffebead3e66a88f260003b26465a67d9988a09fa124ee723a13cc33bd2a9ebf4a82aa2747b94eeb5bcb3e4ec00ca778c80e8fbde1a700ff09f18402960548 +SHA512 (kernel-abi-stablelists-6.5.0.tar.bz2) = 7457f60fd7abe2c6d95271ce5c70c71a6882babdc826f6f7c0d8d3e3aee21ca46e0dfb6856a4cbc38a838dc4efa4d2c3a4a695f6eb9d3bd346947aac1915d724 +SHA512 (kernel-kabi-dw-6.5.0.tar.bz2) = b7b304780e567dabe859ecf0486774c9e8a7d9ac08e3330ce6c0ee791fa4c62809cfc5ebb72eb02556c6c810d4c3439c9fcdbba41f2912f3c945b3d509363026