From 2d4b295a034c61dca7ff35ce2f3e068da1638e10 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Mon, 19 Aug 2024 07:16:53 -0600 Subject: [PATCH] kernel-6.11.0-0.rc4.37 * Mon Aug 19 2024 Fedora Kernel Team [6.11.0-0.rc4.37] - fedora: disable CONFIG_DRM_WERROR (Patrick Talbert) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel.changelog | 14 +++++++++++++- kernel.spec | 17 +++++++++++++---- patch-6.11-redhat.patch | 4 ++-- sources | 4 ++-- 5 files changed, 31 insertions(+), 10 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 750e0c0ab..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 = 34 +RHEL_RELEASE = 37 # # RHEL_REBASE_NUM diff --git a/kernel.changelog b/kernel.changelog index fdccbf5d5..e113aabac 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,7 +1,19 @@ -* Fri Aug 16 2024 Fedora Kernel Team [6.11.0-0.rc3.d7a5aa4b3c00.34] +* Mon Aug 19 2024 Fedora Kernel Team [6.11.0-0.rc4.37] - fedora: disable CONFIG_DRM_WERROR (Patrick Talbert) Resolves: +* Mon Aug 19 2024 Fedora Kernel Team [6.11.0-0.rc4.36] +- Linux v6.11.0-0.rc4 +Resolves: + +* Sun Aug 18 2024 Fedora Kernel Team [6.11.0-0.rc3.c3f2d783a459.35] +- Linux v6.11.0-0.rc3.c3f2d783a459 +Resolves: + +* Sat Aug 17 2024 Fedora Kernel Team [6.11.0-0.rc3.e5fa841af679.34] +- Linux v6.11.0-0.rc3.e5fa841af679 +Resolves: + * Fri Aug 16 2024 Fedora Kernel Team [6.11.0-0.rc3.d7a5aa4b3c00.33] - redhat/configs: Disable dlm in rhel configs (Andrew Price) - rhel: aarch64: enable required PSCI configs (Peter Robinson) diff --git a/kernel.spec b/kernel.spec index 7a11075df..0350cd195 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.rc3.20240816gitd7a5aa4b3c00.34 +%define pkgrelease 0.rc4.37 %define kversion 6 -%define tarfile_release 6.11-rc3-156-gd7a5aa4b3c00 +%define tarfile_release 6.11-rc4 # This is needed to do merge window version magic %define patchlevel 11 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.20240816gitd7a5aa4b3c00.34%{?buildid}%{?dist} +%define specrelease 0.rc4.37%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.11.0 @@ -4097,9 +4097,18 @@ fi\ # # %changelog -* Fri Aug 16 2024 Fedora Kernel Team [6.11.0-0.rc3.d7a5aa4b3c00.34] +* Mon Aug 19 2024 Fedora Kernel Team [6.11.0-0.rc4.37] - fedora: disable CONFIG_DRM_WERROR (Patrick Talbert) +* Mon Aug 19 2024 Fedora Kernel Team [6.11.0-0.rc4.36] +- Linux v6.11.0-0.rc4 + +* Sun Aug 18 2024 Fedora Kernel Team [6.11.0-0.rc3.c3f2d783a459.35] +- Linux v6.11.0-0.rc3.c3f2d783a459 + +* Sat Aug 17 2024 Fedora Kernel Team [6.11.0-0.rc3.e5fa841af679.34] +- Linux v6.11.0-0.rc3.e5fa841af679 + * Fri Aug 16 2024 Fedora Kernel Team [6.11.0-0.rc3.d7a5aa4b3c00.33] - redhat/configs: Disable dlm in rhel configs (Andrew Price) - rhel: aarch64: enable required PSCI configs (Peter Robinson) diff --git a/patch-6.11-redhat.patch b/patch-6.11-redhat.patch index 8a8d7d8d9..fb0812c23 100644 --- a/patch-6.11-redhat.patch +++ b/patch-6.11-redhat.patch @@ -188,7 +188,7 @@ index 000000000000..7465c78a90e6 + +endmenu diff --git a/Makefile b/Makefile -index 0a364e34f50b..f5b101e4c59f 100644 +index 68ebd6d6b444..66c7f3a31232 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -837,7 +837,7 @@ index 1687483ff319..390b67f19181 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index 59771412686b..a9f8c59eca59 100644 +index 22ae7829a915..1329032ed09b 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1802,6 +1802,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) diff --git a/sources b/sources index ca7b23dfa..849a42f85 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.11-rc3-156-gd7a5aa4b3c00.tar.xz) = d45b75cc06339f5b423f8930a88ca5004933d417d3938f8159d7ad68d8b25a1062531c5041a107a4388bf1962433708e757d552f90a4a069630d910d3a707486 -SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = 6dd8fdfe2c90ac23e9f809912b1466e70a91ec3fb8ed35f5218b5368e580a839dae74c900180f3b5b158db7dd9626c829f620ccd5ee3ca48851df99f23f1f8df +SHA512 (linux-6.11-rc4.tar.xz) = 30bdb3101583da58ebb06a52227d76216382874b4dbd5248dbbc9413d6ac223345a99fa00d3f088625c7402e55142828a019a61ad8ef431a144a84e6c21821c5 +SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = d311b0e6a80215acaecb0c6329d1315214402fdf09fcd9b75f67f772ce3b8f9f0334f9e3a7d10ce7f3e21e385d9c2a9735451d750adc6737e54ba3fad7407791 SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = ab11eb70b0fa046a4ce50bc6ecf4a3f650969a8b7f5d15ee41ee8f592b3d6d138959b1fd2a1edc288b9ed7e42068b095ff3f8bff17d571fbe8c329e94fefd682