From bf6cacfab213ef21407de49595f0d3394af9a5c0 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Tue, 30 Jul 2024 12:46:35 -0600 Subject: [PATCH] kernel-6.11.0-0.rc1.20240730git94ede2a3e913.17 * Tue Jul 30 2024 Fedora Kernel Team [6.11.0-0.rc1.94ede2a3e913.17] - fedora: disable CONFIG_DRM_WERROR (Patrick Talbert) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel.changelog | 6 +++++- kernel.spec | 11 +++++++---- patch-6.11-redhat.patch | 4 ++-- sources | 6 +++--- 5 files changed, 18 insertions(+), 11 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 3943824d4..cb2beaa85 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 = 16 +RHEL_RELEASE = 17 # # RHEL_REBASE_NUM diff --git a/kernel.changelog b/kernel.changelog index 6bcb3ddd3..741f5cd6f 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,7 +1,11 @@ -* Mon Jul 29 2024 Fedora Kernel Team [6.11.0-0.rc1.dc1c8034e31b.16] +* Tue Jul 30 2024 Fedora Kernel Team [6.11.0-0.rc1.94ede2a3e913.17] - fedora: disable CONFIG_DRM_WERROR (Patrick Talbert) Resolves: +* Tue Jul 30 2024 Fedora Kernel Team [6.11.0-0.rc1.94ede2a3e913.16] +- Linux v6.11.0-0.rc1.94ede2a3e913 +Resolves: + * Mon Jul 29 2024 Fedora Kernel Team [6.11.0-0.rc1.dc1c8034e31b.15] - fedora: set CONFIG_REGULATOR_RZG2L_VBCTRL as a module for arm64 (Patrick Talbert) - Linux v6.11.0-0.rc1.dc1c8034e31b diff --git a/kernel.spec b/kernel.spec index 742ed4aa7..3ac4e1846 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.rc1.20240729gitdc1c8034e31b.16 +%define pkgrelease 0.rc1.20240730git94ede2a3e913.17 %define kversion 6 -%define tarfile_release 6.11-rc1-4-gdc1c8034e31b +%define tarfile_release 6.11-rc1-43-g94ede2a3e913 # This is needed to do merge window version magic %define patchlevel 11 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc1.20240729gitdc1c8034e31b.16%{?buildid}%{?dist} +%define specrelease 0.rc1.20240730git94ede2a3e913.17%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.11.0 @@ -4043,9 +4043,12 @@ fi\ # # %changelog -* Mon Jul 29 2024 Fedora Kernel Team [6.11.0-0.rc1.dc1c8034e31b.16] +* Tue Jul 30 2024 Fedora Kernel Team [6.11.0-0.rc1.94ede2a3e913.17] - fedora: disable CONFIG_DRM_WERROR (Patrick Talbert) +* Tue Jul 30 2024 Fedora Kernel Team [6.11.0-0.rc1.94ede2a3e913.16] +- Linux v6.11.0-0.rc1.94ede2a3e913 + * Mon Jul 29 2024 Fedora Kernel Team [6.11.0-0.rc1.dc1c8034e31b.15] - fedora: set CONFIG_REGULATOR_RZG2L_VBCTRL as a module for arm64 (Patrick Talbert) - Linux v6.11.0-0.rc1.dc1c8034e31b diff --git a/patch-6.11-redhat.patch b/patch-6.11-redhat.patch index aa79fea67..9fa90a07b 100644 --- a/patch-6.11-redhat.patch +++ b/patch-6.11-redhat.patch @@ -178,10 +178,10 @@ index 8ad55d6e7b60..6f2aaa2c9efb 100644 $(version_h): private PATCHLEVEL := $(or $(PATCHLEVEL), 0) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index 954a1916a500..205966cc405a 100644 +index 54b2bb817a7f..0415b853e1af 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig -@@ -1225,9 +1225,9 @@ config HIGHMEM +@@ -1227,9 +1227,9 @@ config HIGHMEM If unsure, say n. config HIGHPTE diff --git a/sources b/sources index 7e162a6f3..e835a5d04 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.11-rc1-4-gdc1c8034e31b.tar.xz) = c56381af2bdca44e9d897a07a79af7d9ac217a683a72a8357972268271e399fc5307b197a7aad90fd73ec15586a45a87a5941991cdb80e40064346b892b9cbc0 -SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = 48354f8509484b6a88dd1752b01d390208af7807aae855c4699076fddd47886bb51e5980b3a1466c35304f51b65e8dae1c2c5bddd1fc759b5f1985e0ac3fb7ba -SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = fc632aaee40305db00566453c3f466128bdf7a667eb0406ba5748b568b788792ad53a65650b72a3b94ad85ee74c18f4172f38f6e76fd3d25eace86a47d64ac12 +SHA512 (linux-6.11-rc1-43-g94ede2a3e913.tar.xz) = 3431b4a5373cefe3d7d7f6601ad50dd15f5e9517dd5a1facf488286ff34db6cd15ab1bc0d189739dd9c6b1041d61a71ff297d45416d44510976903af503a93ab +SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = 9075812ddb3d918221a09f22bd6368338e5cbfd45e35560fac7a1f1c826fbace7630ea69748bdfd5b874c2b585cc5b076dd9b91b1d17819c0870f496991a6a1f +SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = b9b9c336b1966d5f25596f9d09ce98985529121b9cc5e799c168a43d9894a01809424381aac12b1e0c282ca71c74879933049bab0fbb52109a662b26f912fe1a