From 3c9c2963c59649cd074e39ae08e60b72407fd3a3 Mon Sep 17 00:00:00 2001 From: Patrick Talbert Date: Thu, 27 Jul 2023 15:58:31 +0200 Subject: [PATCH] kernel-6.5.0-0.rc3.20230727git0a8db05b571a.26 * Thu Jul 27 2023 Fedora Kernel Team [6.5.0-0.rc3.0a8db05b571a.26.el127] - redhat/configs: Disable FIREWIRE for RHEL (Prarit Bhargava) - Linux v6.5.0-0.rc3.0a8db05b571a Resolves: Signed-off-by: Patrick Talbert --- Makefile.rhelver | 2 +- kernel-ppc64le-debug-rhel.config | 2 +- kernel-ppc64le-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 +++--- 9 files changed, 17 insertions(+), 13 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 96c4e2660..5ec3fb3a4 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 = 25 +RHEL_RELEASE = 26 # # RHEL_REBASE_NUM diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 65c837798..e71cfec55 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -1683,8 +1683,8 @@ CONFIG_FB=y CONFIG_FHANDLE=y # CONFIG_FIND_BIT_BENCHMARK is not set CONFIG_FIPS_SIGNATURE_SELFTEST=y +# CONFIG_FIREWIRE is not set CONFIG_FIREWIRE_KUNIT_UAPI_TEST=m -CONFIG_FIREWIRE=m CONFIG_FIREWIRE_NET=m # CONFIG_FIREWIRE_NOSY is not set CONFIG_FIREWIRE_OHCI=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 16ca3b7be..42d57038c 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -1667,8 +1667,8 @@ CONFIG_FB=y CONFIG_FHANDLE=y # CONFIG_FIND_BIT_BENCHMARK is not set CONFIG_FIPS_SIGNATURE_SELFTEST=y +# CONFIG_FIREWIRE is not set CONFIG_FIREWIRE_KUNIT_UAPI_TEST=m -CONFIG_FIREWIRE=m CONFIG_FIREWIRE_NET=m # CONFIG_FIREWIRE_NOSY is not set CONFIG_FIREWIRE_OHCI=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 5b20d3117..a15ac12f3 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -1796,8 +1796,8 @@ CONFIG_FCOE_FNIC=m CONFIG_FHANDLE=y # CONFIG_FIND_BIT_BENCHMARK is not set CONFIG_FIPS_SIGNATURE_SELFTEST=y +# CONFIG_FIREWIRE is not set CONFIG_FIREWIRE_KUNIT_UAPI_TEST=m -CONFIG_FIREWIRE=m CONFIG_FIREWIRE_NET=m # CONFIG_FIREWIRE_NOSY is not set CONFIG_FIREWIRE_OHCI=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index d1c84fd32..ac9734214 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -1780,8 +1780,8 @@ CONFIG_FCOE_FNIC=m CONFIG_FHANDLE=y # CONFIG_FIND_BIT_BENCHMARK is not set CONFIG_FIPS_SIGNATURE_SELFTEST=y +# CONFIG_FIREWIRE is not set CONFIG_FIREWIRE_KUNIT_UAPI_TEST=m -CONFIG_FIREWIRE=m CONFIG_FIREWIRE_NET=m # CONFIG_FIREWIRE_NOSY is not set CONFIG_FIREWIRE_OHCI=m diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 70bda5845..e31996c5b 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -1878,8 +1878,8 @@ CONFIG_FHANDLE=y CONFIG_FILE_LOCKING=y # CONFIG_FIND_BIT_BENCHMARK is not set CONFIG_FIPS_SIGNATURE_SELFTEST=y +# CONFIG_FIREWIRE is not set CONFIG_FIREWIRE_KUNIT_UAPI_TEST=m -CONFIG_FIREWIRE=m CONFIG_FIREWIRE_NET=m # CONFIG_FIREWIRE_NOSY is not set CONFIG_FIREWIRE_OHCI=m diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index 34b61c63b..301067e6a 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -1862,8 +1862,8 @@ CONFIG_FHANDLE=y CONFIG_FILE_LOCKING=y # CONFIG_FIND_BIT_BENCHMARK is not set CONFIG_FIPS_SIGNATURE_SELFTEST=y +# CONFIG_FIREWIRE is not set CONFIG_FIREWIRE_KUNIT_UAPI_TEST=m -CONFIG_FIREWIRE=m CONFIG_FIREWIRE_NET=m # CONFIG_FIREWIRE_NOSY is not set CONFIG_FIREWIRE_OHCI=m diff --git a/kernel.spec b/kernel.spec index 07d0df464..61f7092cf 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.rc3.20230726git18b44bc5a672.25 +%define pkgrelease 0.rc3.20230727git0a8db05b571a.26 %define kversion 6 -%define tarfile_release 6.5-rc3-24-g18b44bc5a672 +%define tarfile_release 6.5-rc3-44-g0a8db05b571a # This is needed to do merge window version magic %define patchlevel 5 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.20230726git18b44bc5a672.25%{?buildid}%{?dist} +%define specrelease 0.rc3.20230727git0a8db05b571a.26%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.5.0 @@ -3740,6 +3740,10 @@ fi\ # # %changelog +* Thu Jul 27 2023 Fedora Kernel Team [6.5.0-0.rc3.0a8db05b571a.26.el127] +- redhat/configs: Disable FIREWIRE for RHEL (Prarit Bhargava) +- Linux v6.5.0-0.rc3.0a8db05b571a + * Wed Jul 26 2023 Fedora Kernel Team [6.5.0-0.rc3.18b44bc5a672.25.el127] - redhat/scripts/rh-dist-git.sh: print list of uploaded files (Denys Vlasenko) - redhat/scripts/expand_srpm.sh: add missing function, robustify (Denys Vlasenko) diff --git a/sources b/sources index 1558c2153..f4ba4ba0c 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.5-rc3-24-g18b44bc5a672.tar.xz) = 6498cc054e8b06434c73f7046d2a1c971858c47ded32ec1216c6069172770a6a8b96aeff7661a067a5cdc0843730a24b6c737ad1d4f51a035149340d6c156f76 -SHA512 (kernel-abi-stablelists-6.5.0.tar.bz2) = 27d486c7068d1057015f5109a105ac2c119e865460d9b6a95f6c7857961f71181cc8949624ea9d0a6f51623390699540943d453f05e2d7deccc1306afa8d4b51 -SHA512 (kernel-kabi-dw-6.5.0.tar.bz2) = 3e5e10071bdd2ed35503b0c5ca013dbf91fe3980761db1cf07c6df8fe613375f89f0efc84be7eff25d02f1c1e7191bbe6ae7f641448e79977400bfc10096ca31 +SHA512 (linux-6.5-rc3-44-g0a8db05b571a.tar.xz) = 10948a1621f38af92abb280ea2c68956eb80e873f70f1c820a5e307f3a0e159bc95fa4a92194be3ec90b2211016f469f3be61c007f27177527e29813f68b7567 +SHA512 (kernel-abi-stablelists-6.5.0.tar.bz2) = 45990dadcefe75363a50c15d1acff75a4d730d77d53d28e7e7b17c13bd9688f5053af1fc0235666184946441c4249db5c103b9c6fb8d6dd3da42981f17e228ca +SHA512 (kernel-kabi-dw-6.5.0.tar.bz2) = cb583c41b782fc8562c83179e0250c76ecf314abe8aeec8c39c4fbc9a790cd6f8ed378faf4e8bf70051d301eb3eae623bc8dea45756ce101499c3f7611eca641