From a33774f873566a5a842134a80db1f4692cdb97d2 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 3 Sep 2024 14:07:11 -0600 Subject: [PATCH 1/5] kernel-6.11.0-0.rc6.20240902git67784a74e258.50 * Mon Sep 02 2024 Fedora Kernel Team [6.11.0-0.rc6.67784a74e258.50] - Linux v6.11.0-0.rc6.67784a74e258 Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel.changelog | 4 ++++ kernel.spec | 9 ++++++--- sources | 6 +++--- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 943e2e14a..23c59cd4f 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 = 49 +RHEL_RELEASE = 50 # # RHEL_REBASE_NUM diff --git a/kernel.changelog b/kernel.changelog index 497011ddf..d065bcb6b 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,7 @@ +* Mon Sep 02 2024 Fedora Kernel Team [6.11.0-0.rc6.67784a74e258.50] +- Linux v6.11.0-0.rc6.67784a74e258 +Resolves: + * Sun Sep 01 2024 Fedora Kernel Team [6.11.0-0.rc6.49] - Linux v6.11.0-0.rc6 Resolves: diff --git a/kernel.spec b/kernel.spec index 2b3347b23..f79ad155b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.11.0 %define specversion 6.11.0 %define patchversion 6.11 -%define pkgrelease 0.rc6.49 +%define pkgrelease 0.rc6.20240902git67784a74e258.50 %define kversion 6 -%define tarfile_release 6.11-rc6 +%define tarfile_release 6.11-rc6-19-g67784a74e258 # This is needed to do merge window version magic %define patchlevel 11 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.49%{?buildid}%{?dist} +%define specrelease 0.rc6.20240902git67784a74e258.50%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.11.0 @@ -4111,6 +4111,9 @@ fi\ # # %changelog +* Mon Sep 02 2024 Fedora Kernel Team [6.11.0-0.rc6.67784a74e258.50] +- Linux v6.11.0-0.rc6.67784a74e258 + * Sun Sep 01 2024 Fedora Kernel Team [6.11.0-0.rc6.49] - Linux v6.11.0-0.rc6 diff --git a/sources b/sources index 57c3ad921..d3936eaf6 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.11-rc6.tar.xz) = 29b74d86d56a2122a89718a6f8a05dd67f353e15b5d653a2dc0b87e64e452037223e5e8b35869f17e58feaa63bd4411847a4e97b97245b427d3000fc0b8f76d5 -SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = f530626b358c18784c9c4aeb301592196a70f128fb62184f63a0757238e808c83bbfd49a88c58a5c148bbeaef1cbcbf78ccc1aa11b80bc752a7da271a2ca995c -SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = 054d94f9dfbfc5eaa2d68ad1be50872e2e2db84a34c5a199f8e6b584488c0797eb767674fcc4ec049440c00572337f76647de3e2901a150417ecee2dbdb92ffb +SHA512 (linux-6.11-rc6-19-g67784a74e258.tar.xz) = 8b5179ddbd7f733f8ec4ea8ad3210ba5189c232ec9bfb15541497390fa0d338b9710aa7250660a53988f89aff5add994e0df701aa8c5973439ecd689a9ebc8d2 +SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = 0130a73384f8e27b37bc3132a04ad907da473407bdc38612e1929703e7688a372c1d2da3193c439aeada6b7f0e4dc4bf262e29058fda50c12f897ac6c2175aeb +SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = 889622ed0b1e94a0efcd8ca3b3ed4b6dba6979c5564e9d11e25d39bc6c7b60f07f0d7412e6bb732220807dd0b8b559daa3b42927e23f5ccb15104cf27df5f8b1 From cae0592ba25f99dfc4b25662aa6e439126e5d68a Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 4 Sep 2024 10:43:36 -0600 Subject: [PATCH 2/5] kernel-6.11.0-0.rc6.20240904git88fac17500f4.51 * Wed Sep 04 2024 Fedora Kernel Team [6.11.0-0.rc6.88fac17500f4.51] - Linux v6.11.0-0.rc6.88fac17500f4 Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 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 | 4 ++++ kernel.spec | 9 ++++++--- sources | 6 +++--- 13 files changed, 14 insertions(+), 25 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 23c59cd4f..9826d97f6 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 = 50 +RHEL_RELEASE = 51 # # RHEL_REBASE_NUM diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index db755adde..8a76160cf 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -4788,8 +4788,6 @@ CONFIG_QCA83XX_PHY=m # CONFIG_QCOM_SPM is not set # CONFIG_QCOM_SPMI_VADC is not set # CONFIG_QCOM_SSC_BLOCK_BUS is not set -CONFIG_QCOM_TZMEM_MODE_GENERIC=y -# CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE is not set CONFIG_QEDE=m CONFIG_QED_FCOE=y CONFIG_QEDF=m diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index b1bc9f2c0..dae0fff38 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -4767,8 +4767,6 @@ CONFIG_QCA83XX_PHY=m # CONFIG_QCOM_SPM is not set # CONFIG_QCOM_SPMI_VADC is not set # CONFIG_QCOM_SSC_BLOCK_BUS is not set -CONFIG_QCOM_TZMEM_MODE_GENERIC=y -# CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE is not set CONFIG_QEDE=m CONFIG_QED_FCOE=y CONFIG_QEDF=m diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index b5d47ba96..db73e9f83 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -4720,8 +4720,6 @@ CONFIG_QCA83XX_PHY=m # CONFIG_QCOM_SPM is not set # CONFIG_QCOM_SPMI_VADC is not set # CONFIG_QCOM_SSC_BLOCK_BUS is not set -CONFIG_QCOM_TZMEM_MODE_GENERIC=y -# CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE is not set CONFIG_QDIO=m CONFIG_QEDE=m CONFIG_QED_FCOE=y diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index f30060c88..c1aa804a9 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -4699,8 +4699,6 @@ CONFIG_QCA83XX_PHY=m # CONFIG_QCOM_SPM is not set # CONFIG_QCOM_SPMI_VADC is not set # CONFIG_QCOM_SSC_BLOCK_BUS is not set -CONFIG_QCOM_TZMEM_MODE_GENERIC=y -# CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE is not set CONFIG_QDIO=m CONFIG_QEDE=m CONFIG_QED_FCOE=y diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index ea0890249..686dce38a 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -4711,8 +4711,6 @@ CONFIG_QCA83XX_PHY=m # CONFIG_QCOM_SPM is not set # CONFIG_QCOM_SPMI_VADC is not set # CONFIG_QCOM_SSC_BLOCK_BUS is not set -CONFIG_QCOM_TZMEM_MODE_GENERIC=y -# CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE is not set CONFIG_QDIO=y CONFIG_QEDE=m CONFIG_QED_FCOE=y diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 57dfb8ff5..a56521806 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -5008,8 +5008,6 @@ CONFIG_QCA83XX_PHY=m # CONFIG_QCOM_SPM is not set # CONFIG_QCOM_SPMI_VADC is not set # CONFIG_QCOM_SSC_BLOCK_BUS is not set -CONFIG_QCOM_TZMEM_MODE_GENERIC=y -# CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE is not set CONFIG_QEDE=m CONFIG_QED_FCOE=y CONFIG_QEDF=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 3c21c7e2c..19a7586a6 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -4986,8 +4986,6 @@ CONFIG_QCA83XX_PHY=m # CONFIG_QCOM_SPM is not set # CONFIG_QCOM_SPMI_VADC is not set # CONFIG_QCOM_SSC_BLOCK_BUS is not set -CONFIG_QCOM_TZMEM_MODE_GENERIC=y -# CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE is not set CONFIG_QEDE=m CONFIG_QED_FCOE=y CONFIG_QEDF=m diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index cc42ebcc1..b76f0b7cc 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -5052,8 +5052,6 @@ CONFIG_QCA83XX_PHY=m # CONFIG_QCOM_SPM is not set # CONFIG_QCOM_SPMI_VADC is not set # CONFIG_QCOM_SSC_BLOCK_BUS is not set -CONFIG_QCOM_TZMEM_MODE_GENERIC=y -# CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE is not set CONFIG_QEDE=m CONFIG_QED_FCOE=y CONFIG_QEDF=m diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index 7d5a9dc61..18c4a4cb0 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -5030,8 +5030,6 @@ CONFIG_QCA83XX_PHY=m # CONFIG_QCOM_SPM is not set # CONFIG_QCOM_SPMI_VADC is not set # CONFIG_QCOM_SSC_BLOCK_BUS is not set -CONFIG_QCOM_TZMEM_MODE_GENERIC=y -# CONFIG_QCOM_TZMEM_MODE_SHMBRIDGE is not set CONFIG_QEDE=m CONFIG_QED_FCOE=y CONFIG_QEDF=m diff --git a/kernel.changelog b/kernel.changelog index d065bcb6b..0f58f639f 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,7 @@ +* Wed Sep 04 2024 Fedora Kernel Team [6.11.0-0.rc6.88fac17500f4.51] +- Linux v6.11.0-0.rc6.88fac17500f4 +Resolves: + * Mon Sep 02 2024 Fedora Kernel Team [6.11.0-0.rc6.67784a74e258.50] - Linux v6.11.0-0.rc6.67784a74e258 Resolves: diff --git a/kernel.spec b/kernel.spec index f79ad155b..e97571293 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.11.0 %define specversion 6.11.0 %define patchversion 6.11 -%define pkgrelease 0.rc6.20240902git67784a74e258.50 +%define pkgrelease 0.rc6.20240904git88fac17500f4.51 %define kversion 6 -%define tarfile_release 6.11-rc6-19-g67784a74e258 +%define tarfile_release 6.11-rc6-26-g88fac17500f4 # This is needed to do merge window version magic %define patchlevel 11 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.20240902git67784a74e258.50%{?buildid}%{?dist} +%define specrelease 0.rc6.20240904git88fac17500f4.51%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.11.0 @@ -4111,6 +4111,9 @@ fi\ # # %changelog +* Wed Sep 04 2024 Fedora Kernel Team [6.11.0-0.rc6.88fac17500f4.51] +- Linux v6.11.0-0.rc6.88fac17500f4 + * Mon Sep 02 2024 Fedora Kernel Team [6.11.0-0.rc6.67784a74e258.50] - Linux v6.11.0-0.rc6.67784a74e258 diff --git a/sources b/sources index d3936eaf6..86028b74a 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.11-rc6-19-g67784a74e258.tar.xz) = 8b5179ddbd7f733f8ec4ea8ad3210ba5189c232ec9bfb15541497390fa0d338b9710aa7250660a53988f89aff5add994e0df701aa8c5973439ecd689a9ebc8d2 -SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = 0130a73384f8e27b37bc3132a04ad907da473407bdc38612e1929703e7688a372c1d2da3193c439aeada6b7f0e4dc4bf262e29058fda50c12f897ac6c2175aeb -SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = 889622ed0b1e94a0efcd8ca3b3ed4b6dba6979c5564e9d11e25d39bc6c7b60f07f0d7412e6bb732220807dd0b8b559daa3b42927e23f5ccb15104cf27df5f8b1 +SHA512 (linux-6.11-rc6-26-g88fac17500f4.tar.xz) = 23662bfb387c1989bc0b6369a6572755b5b22ff5a703f945ab9351cf419eeba12866c83b03ad495488f2bc4c512f58114f80665dbedfedb36ce0b7581e4f5646 +SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = 5c1caa368ea70418d18a296b628fd9584e6bc6fe589a66313b5a6ba8de89fdfff26b866b300ea7b979f381779823c5a955c7cffed3fd3107689c7b8122cf0131 +SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = b2b17753661f90b6f4042b26b42297737706fb88365ccf96e074fc7273ad2f6ca5d8156b8b6395c79b3924d9042a62770171582014245d683400f26240c78939 From 2f0a0a532cd8f8f587c7f6d6e469990d69b4a428 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 5 Sep 2024 14:22:26 -0600 Subject: [PATCH 3/5] kernel-6.11.0-0.rc6.20240905gitc763c4339688.52 * Thu Sep 05 2024 Fedora Kernel Team [6.11.0-0.rc6.c763c4339688.52] - Linux v6.11.0-0.rc6.c763c4339688 Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel.changelog | 4 ++++ kernel.spec | 9 ++++++--- patch-6.11-redhat.patch | 2 +- sources | 6 +++--- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 9826d97f6..e3e32f88f 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 = 51 +RHEL_RELEASE = 52 # # RHEL_REBASE_NUM diff --git a/kernel.changelog b/kernel.changelog index 0f58f639f..96a708655 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,7 @@ +* Thu Sep 05 2024 Fedora Kernel Team [6.11.0-0.rc6.c763c4339688.52] +- Linux v6.11.0-0.rc6.c763c4339688 +Resolves: + * Wed Sep 04 2024 Fedora Kernel Team [6.11.0-0.rc6.88fac17500f4.51] - Linux v6.11.0-0.rc6.88fac17500f4 Resolves: diff --git a/kernel.spec b/kernel.spec index e97571293..230654d2b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.11.0 %define specversion 6.11.0 %define patchversion 6.11 -%define pkgrelease 0.rc6.20240904git88fac17500f4.51 +%define pkgrelease 0.rc6.20240905gitc763c4339688.52 %define kversion 6 -%define tarfile_release 6.11-rc6-26-g88fac17500f4 +%define tarfile_release 6.11-rc6-70-gc763c4339688 # This is needed to do merge window version magic %define patchlevel 11 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.20240904git88fac17500f4.51%{?buildid}%{?dist} +%define specrelease 0.rc6.20240905gitc763c4339688.52%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.11.0 @@ -4111,6 +4111,9 @@ fi\ # # %changelog +* Thu Sep 05 2024 Fedora Kernel Team [6.11.0-0.rc6.c763c4339688.52] +- Linux v6.11.0-0.rc6.c763c4339688 + * Wed Sep 04 2024 Fedora Kernel Team [6.11.0-0.rc6.88fac17500f4.51] - Linux v6.11.0-0.rc6.88fac17500f4 diff --git a/patch-6.11-redhat.patch b/patch-6.11-redhat.patch index 77c644824..b487ce9d0 100644 --- a/patch-6.11-redhat.patch +++ b/patch-6.11-redhat.patch @@ -273,7 +273,7 @@ index d57cfc6896b8..1dd324956fcd 100644 @: diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 54b2bb817a7f..0415b853e1af 100644 +index 173159e93c99..5074a7e9f9b8 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1227,9 +1227,9 @@ config HIGHMEM diff --git a/sources b/sources index 86028b74a..8586e6f79 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.11-rc6-26-g88fac17500f4.tar.xz) = 23662bfb387c1989bc0b6369a6572755b5b22ff5a703f945ab9351cf419eeba12866c83b03ad495488f2bc4c512f58114f80665dbedfedb36ce0b7581e4f5646 -SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = 5c1caa368ea70418d18a296b628fd9584e6bc6fe589a66313b5a6ba8de89fdfff26b866b300ea7b979f381779823c5a955c7cffed3fd3107689c7b8122cf0131 -SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = b2b17753661f90b6f4042b26b42297737706fb88365ccf96e074fc7273ad2f6ca5d8156b8b6395c79b3924d9042a62770171582014245d683400f26240c78939 +SHA512 (linux-6.11-rc6-70-gc763c4339688.tar.xz) = 4a847d7a42592ee9f04958e590f9b811f2a5d6e4c359d6c17e030184ec4ead443dfc0c5a830d8bebd608fb3458af6c5310fe920842970440a54a5a562df1f891 +SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = e11114e5dc08af328420b305fb19dbdb5c41758970ddedfa0707a427c7a396fc1bb4dc3b8672bc5022c92b6ba4465904fc77df546f1e3e916ff4c2c50d016dc7 +SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = 586b0d6c5e9bba427211efb246b1b997cfada61fbd41c9479a839a46ec03a855e354db62e5233e45e87035ad6b9433c438da1074d720d2e3b8f1c611271ff0d6 From df6cf6a7c41de768a78f8d0cd5bd465b5387ed91 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 6 Sep 2024 10:50:31 -0600 Subject: [PATCH 4/5] kernel-6.11.0-0.rc6.20240906gitb831f83e40a2.53 * Fri Sep 06 2024 Fedora Kernel Team [6.11.0-0.rc6.b831f83e40a2.53] - Linux v6.11.0-0.rc6.b831f83e40a2 Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel.changelog | 4 ++++ kernel.spec | 9 ++++++--- patch-6.11-redhat.patch | 6 +++--- sources | 6 +++--- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index e3e32f88f..045195d74 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 = 52 +RHEL_RELEASE = 53 # # RHEL_REBASE_NUM diff --git a/kernel.changelog b/kernel.changelog index 96a708655..8066a6ec4 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,7 @@ +* Fri Sep 06 2024 Fedora Kernel Team [6.11.0-0.rc6.b831f83e40a2.53] +- Linux v6.11.0-0.rc6.b831f83e40a2 +Resolves: + * Thu Sep 05 2024 Fedora Kernel Team [6.11.0-0.rc6.c763c4339688.52] - Linux v6.11.0-0.rc6.c763c4339688 Resolves: diff --git a/kernel.spec b/kernel.spec index 230654d2b..fd1aff7d7 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.11.0 %define specversion 6.11.0 %define patchversion 6.11 -%define pkgrelease 0.rc6.20240905gitc763c4339688.52 +%define pkgrelease 0.rc6.20240906gitb831f83e40a2.53 %define kversion 6 -%define tarfile_release 6.11-rc6-70-gc763c4339688 +%define tarfile_release 6.11-rc6-183-gb831f83e40a2 # This is needed to do merge window version magic %define patchlevel 11 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.20240905gitc763c4339688.52%{?buildid}%{?dist} +%define specrelease 0.rc6.20240906gitb831f83e40a2.53%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.11.0 @@ -4111,6 +4111,9 @@ fi\ # # %changelog +* Fri Sep 06 2024 Fedora Kernel Team [6.11.0-0.rc6.b831f83e40a2.53] +- Linux v6.11.0-0.rc6.b831f83e40a2 + * Thu Sep 05 2024 Fedora Kernel Team [6.11.0-0.rc6.c763c4339688.52] - Linux v6.11.0-0.rc6.c763c4339688 diff --git a/patch-6.11-redhat.patch b/patch-6.11-redhat.patch index b487ce9d0..c1a968dda 100644 --- a/patch-6.11-redhat.patch +++ b/patch-6.11-redhat.patch @@ -193,7 +193,7 @@ index 000000000000..7465c78a90e6 + +endmenu diff --git a/Makefile b/Makefile -index d57cfc6896b8..1dd324956fcd 100644 +index b1f3bf584d4a..6b7bbf0c3e2e 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -233,7 +233,7 @@ index d57cfc6896b8..1dd324956fcd 100644 ifdef mixed-build # =========================================================================== # We're called with mixed targets (*config and build targets). -@@ -1241,7 +1264,13 @@ define filechk_version.h +@@ -1242,7 +1265,13 @@ define filechk_version.h ((c) > 255 ? 255 : (c)))'; \ echo \#define LINUX_VERSION_MAJOR $(VERSION); \ echo \#define LINUX_VERSION_PATCHLEVEL $(PATCHLEVEL); \ @@ -248,7 +248,7 @@ index d57cfc6896b8..1dd324956fcd 100644 endef $(version_h): private PATCHLEVEL := $(or $(PATCHLEVEL), 0) -@@ -1848,6 +1877,23 @@ endif +@@ -1849,6 +1878,23 @@ endif ifdef CONFIG_MODULES diff --git a/sources b/sources index 8586e6f79..088e1ec3d 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.11-rc6-70-gc763c4339688.tar.xz) = 4a847d7a42592ee9f04958e590f9b811f2a5d6e4c359d6c17e030184ec4ead443dfc0c5a830d8bebd608fb3458af6c5310fe920842970440a54a5a562df1f891 -SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = e11114e5dc08af328420b305fb19dbdb5c41758970ddedfa0707a427c7a396fc1bb4dc3b8672bc5022c92b6ba4465904fc77df546f1e3e916ff4c2c50d016dc7 -SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = 586b0d6c5e9bba427211efb246b1b997cfada61fbd41c9479a839a46ec03a855e354db62e5233e45e87035ad6b9433c438da1074d720d2e3b8f1c611271ff0d6 +SHA512 (linux-6.11-rc6-183-gb831f83e40a2.tar.xz) = b5d123a82ea43f460217c8f0ed2a9a5830d844a51472ca4e6bce3c8e877b0155ada5b973d532e87054d014b2c494522719ed3aea731f6072b9e30e0cf533bd68 +SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = f9069aaf538a472c8c8bed53eeb4c982982201034e50bf479ffe2574aec7825479b9ca01f3d6758a0d92655ad4ebf5ce0d6ad09bc7c074625c64b7a1e2ca1bc6 +SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = e558790f22d6879d9006ea59634a93af465c94c4ae2587f1b9d14c5f62f52cadedd62b30e100d528ea44bb7479ed72c3a6b4983627a3f53ff9584fd3164d8dc6 From d8338ce40ed1b8b874950450bdc37c87dc91c4c0 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 9 Sep 2024 07:43:54 -0600 Subject: [PATCH 5/5] kernel-6.11.0-0.rc7.56 * Mon Sep 09 2024 Fedora Kernel Team [6.11.0-0.rc7.56] - Linux v6.11.0-0.rc7 Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel.changelog | 12 ++++++++++++ kernel.spec | 15 ++++++++++++--- patch-6.11-redhat.patch | 8 ++++---- sources | 6 +++--- 5 files changed, 32 insertions(+), 11 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 045195d74..5da85be4c 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 = 53 +RHEL_RELEASE = 56 # # RHEL_REBASE_NUM diff --git a/kernel.changelog b/kernel.changelog index 8066a6ec4..9ef2f8233 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,15 @@ +* Mon Sep 09 2024 Fedora Kernel Team [6.11.0-0.rc7.56] +- Linux v6.11.0-0.rc7 +Resolves: + +* Sun Sep 08 2024 Fedora Kernel Team [6.11.0-0.rc6.d1f2d51b711a.55] +- Linux v6.11.0-0.rc6.d1f2d51b711a +Resolves: + +* Sat Sep 07 2024 Fedora Kernel Team [6.11.0-0.rc6.b31c44928842.54] +- Linux v6.11.0-0.rc6.b31c44928842 +Resolves: + * Fri Sep 06 2024 Fedora Kernel Team [6.11.0-0.rc6.b831f83e40a2.53] - Linux v6.11.0-0.rc6.b831f83e40a2 Resolves: diff --git a/kernel.spec b/kernel.spec index fd1aff7d7..2ff1eb75d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.11.0 %define specversion 6.11.0 %define patchversion 6.11 -%define pkgrelease 0.rc6.20240906gitb831f83e40a2.53 +%define pkgrelease 0.rc7.56 %define kversion 6 -%define tarfile_release 6.11-rc6-183-gb831f83e40a2 +%define tarfile_release 6.11-rc7 # This is needed to do merge window version magic %define patchlevel 11 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.20240906gitb831f83e40a2.53%{?buildid}%{?dist} +%define specrelease 0.rc7.56%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.11.0 @@ -4111,6 +4111,15 @@ fi\ # # %changelog +* Mon Sep 09 2024 Fedora Kernel Team [6.11.0-0.rc7.56] +- Linux v6.11.0-0.rc7 + +* Sun Sep 08 2024 Fedora Kernel Team [6.11.0-0.rc6.d1f2d51b711a.55] +- Linux v6.11.0-0.rc6.d1f2d51b711a + +* Sat Sep 07 2024 Fedora Kernel Team [6.11.0-0.rc6.b31c44928842.54] +- Linux v6.11.0-0.rc6.b31c44928842 + * Fri Sep 06 2024 Fedora Kernel Team [6.11.0-0.rc6.b831f83e40a2.53] - Linux v6.11.0-0.rc6.b831f83e40a2 diff --git a/patch-6.11-redhat.patch b/patch-6.11-redhat.patch index c1a968dda..66946a849 100644 --- a/patch-6.11-redhat.patch +++ b/patch-6.11-redhat.patch @@ -193,7 +193,7 @@ index 000000000000..7465c78a90e6 + +endmenu diff --git a/Makefile b/Makefile -index b1f3bf584d4a..6b7bbf0c3e2e 100644 +index 2966d5fbbf17..433b17f4a986 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1990,7 +1990,7 @@ index a00671b58701..eeef2766b8b3 100644 if (ret < 0) goto err_allowedips; diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 0dc8bcc664f2..6c524e09b0d5 100644 +index 983909a600ad..28e59054b7c6 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -262,6 +262,9 @@ void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -2060,7 +2060,7 @@ index 0dc8bcc664f2..6c524e09b0d5 100644 #ifdef CONFIG_NVME_HOST_AUTH queue_work(nvme_wq, &ctrl->dhchap_auth_work); diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c -index 91d9eb3c22ef..d44cdba1ffea 100644 +index 518e22dd4f9b..af7d1591e9c6 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -83,14 +83,10 @@ void nvme_mpath_start_freeze(struct nvme_subsystem *subsys) @@ -2096,7 +2096,7 @@ index 91d9eb3c22ef..d44cdba1ffea 100644 spin_lock_irqsave(&ns->head->requeue_lock, flags); for (bio = req->bio; bio; bio = bio->bi_next) { -@@ -998,8 +1004,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) +@@ -1000,8 +1006,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) int error = 0; /* check if multipath is enabled and we have the capability */ diff --git a/sources b/sources index 088e1ec3d..2ee58683e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.11-rc6-183-gb831f83e40a2.tar.xz) = b5d123a82ea43f460217c8f0ed2a9a5830d844a51472ca4e6bce3c8e877b0155ada5b973d532e87054d014b2c494522719ed3aea731f6072b9e30e0cf533bd68 -SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = f9069aaf538a472c8c8bed53eeb4c982982201034e50bf479ffe2574aec7825479b9ca01f3d6758a0d92655ad4ebf5ce0d6ad09bc7c074625c64b7a1e2ca1bc6 -SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = e558790f22d6879d9006ea59634a93af465c94c4ae2587f1b9d14c5f62f52cadedd62b30e100d528ea44bb7479ed72c3a6b4983627a3f53ff9584fd3164d8dc6 +SHA512 (linux-6.11-rc7.tar.xz) = 6d0afb7b215e6eca33aac0dc7a2ca7720daa6f2699503c9017344b0d58d3b5341d17eb41bffbabffba3f824d9f86a224db7f2b99c3f5de93a4cbe588a9074ad4 +SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = d62c00e84ec79616c0d4071cfe6f62c81bc2f6cfca90e6d1def851471b0862b54c842193cfdae272e737faeb8c21d5106e78da719655ac2629b84f6405e02c25 +SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = 7066713fe4fa326f84189ee588808fab4b34855bef653f67948c86310f509bf08c7c2d87cf930fb0107b865b56ef8f3257d50c5c057c52a657a2a146ea13a325