diff --git a/Makefile.rhelver b/Makefile.rhelver index 71911458c..933dc5093 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 = 59 +RHEL_RELEASE = 61 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 3052a4ac4..00e32b53b 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/7091e7aae971eb3bb57cd05575b6d47b023d7b1b - 7091e7aae971eb3bb57cd05575b6d47b023d7b1b not upstream: drop openssl ENGINE API usage +https://gitlab.com/cki-project/kernel-ark/-/commit/49a2b8eff7a45abefa4cd96dc213f18f23e43d61 + 49a2b8eff7a45abefa4cd96dc213f18f23e43d61 not upstream: drop openssl ENGINE API usage https://gitlab.com/cki-project/kernel-ark/-/commit/eb75341619677c7f8b6de39e4742a1bcf6569587 eb75341619677c7f8b6de39e4742a1bcf6569587 redhat: make bnx2xx drivers unmaintained in rhel-10 diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index df2970ded..2055ccf4b 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -2226,7 +2226,7 @@ CONFIG_DRM_VKMS=m CONFIG_DRM_VMWGFX_FBCON=y CONFIG_DRM_VMWGFX=m # CONFIG_DRM_VMWGFX_MKSSTATS is not set -CONFIG_DRM_WERROR=y +# CONFIG_DRM_WERROR is not set # CONFIG_DRM_XE is not set # CONFIG_DRM_XEN_FRONTEND is not set CONFIG_DRM=y diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index aae2e748e..d79c9c633 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -2217,7 +2217,7 @@ CONFIG_DRM_VKMS=m CONFIG_DRM_VMWGFX_FBCON=y CONFIG_DRM_VMWGFX=m # CONFIG_DRM_VMWGFX_MKSSTATS is not set -CONFIG_DRM_WERROR=y +# CONFIG_DRM_WERROR is not set # CONFIG_DRM_XE is not set # CONFIG_DRM_XEN_FRONTEND is not set CONFIG_DRM=y diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 4ef313acd..ad6a73ab8 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -2226,7 +2226,7 @@ CONFIG_DRM_VKMS=m CONFIG_DRM_VMWGFX_FBCON=y CONFIG_DRM_VMWGFX=m # CONFIG_DRM_VMWGFX_MKSSTATS is not set -CONFIG_DRM_WERROR=y +# CONFIG_DRM_WERROR is not set # CONFIG_DRM_XE is not set # CONFIG_DRM_XEN_FRONTEND is not set CONFIG_DRM=y diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index 9b436a513..8c8df3a02 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -2217,7 +2217,7 @@ CONFIG_DRM_VKMS=m CONFIG_DRM_VMWGFX_FBCON=y CONFIG_DRM_VMWGFX=m # CONFIG_DRM_VMWGFX_MKSSTATS is not set -CONFIG_DRM_WERROR=y +# CONFIG_DRM_WERROR is not set # CONFIG_DRM_XE is not set # CONFIG_DRM_XEN_FRONTEND is not set CONFIG_DRM=y diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 05d797561..50873fb54 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -1676,7 +1676,7 @@ CONFIG_DRM_VKMS=m CONFIG_DRM_VMWGFX_FBCON=y CONFIG_DRM_VMWGFX=m # CONFIG_DRM_VMWGFX_MKSSTATS is not set -CONFIG_DRM_WERROR=y +# CONFIG_DRM_WERROR is not set # CONFIG_DRM_XE is not set # CONFIG_DRM_XEN_FRONTEND is not set CONFIG_DRM=y diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index e81cac9ea..41a873957 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -1665,7 +1665,7 @@ CONFIG_DRM_VKMS=m CONFIG_DRM_VMWGFX_FBCON=y CONFIG_DRM_VMWGFX=m # CONFIG_DRM_VMWGFX_MKSSTATS is not set -CONFIG_DRM_WERROR=y +# CONFIG_DRM_WERROR is not set # CONFIG_DRM_XE is not set # CONFIG_DRM_XEN_FRONTEND is not set CONFIG_DRM=y diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 615b263fc..12a46c435 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -1682,7 +1682,7 @@ CONFIG_DRM_VKMS=m CONFIG_DRM_VMWGFX_FBCON=y CONFIG_DRM_VMWGFX=m # CONFIG_DRM_VMWGFX_MKSSTATS is not set -CONFIG_DRM_WERROR=y +# CONFIG_DRM_WERROR is not set # CONFIG_DRM_XE is not set # CONFIG_DRM_XEN_FRONTEND is not set CONFIG_DRM=y diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 96523ba59..f6be8735e 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -1671,7 +1671,7 @@ CONFIG_DRM_VKMS=m CONFIG_DRM_VMWGFX_FBCON=y CONFIG_DRM_VMWGFX=m # CONFIG_DRM_VMWGFX_MKSSTATS is not set -CONFIG_DRM_WERROR=y +# CONFIG_DRM_WERROR is not set # CONFIG_DRM_XE is not set # CONFIG_DRM_XEN_FRONTEND is not set CONFIG_DRM=y diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 02b548c5a..084607e2a 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -1841,7 +1841,7 @@ CONFIG_DRM_VKMS=m CONFIG_DRM_VMWGFX_FBCON=y CONFIG_DRM_VMWGFX=m CONFIG_DRM_VMWGFX_MKSSTATS=y -CONFIG_DRM_WERROR=y +# CONFIG_DRM_WERROR is not set # CONFIG_DRM_XE_DEBUG is not set # CONFIG_DRM_XE_DEBUG_MEM is not set # CONFIG_DRM_XE_DEBUG_SRIOV is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index fc3e30583..2967869cc 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -1830,7 +1830,7 @@ CONFIG_DRM_VKMS=m CONFIG_DRM_VMWGFX_FBCON=y CONFIG_DRM_VMWGFX=m CONFIG_DRM_VMWGFX_MKSSTATS=y -CONFIG_DRM_WERROR=y +# CONFIG_DRM_WERROR is not set # CONFIG_DRM_XE_DEBUG is not set # CONFIG_DRM_XE_DEBUG_MEM is not set # CONFIG_DRM_XE_DEBUG_SRIOV is not set diff --git a/kernel.changelog b/kernel.changelog index 447fe2f19..4e132d5e7 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,5 +1,14 @@ -* Tue Jul 09 2024 Fedora Kernel Team [6.10.0-0.rc7.4376e966ecb7.59] +* Thu Jul 11 2024 Fedora Kernel Team [6.10.0-0.rc7.9d9a2f29aefd.61] +- fedora: disable CONFIG_DRM_WERROR (Patrick Talbert) +Resolves: + +* Thu Jul 11 2024 Fedora Kernel Team [6.10.0-0.rc7.9d9a2f29aefd.60] +- Linux v6.10.0-0.rc7.9d9a2f29aefd +Resolves: + +* Wed Jul 10 2024 Fedora Kernel Team [6.10.0-0.rc7.34afb82a3c67.59] - not upstream: drop openssl ENGINE API usage (Jan Stancek) +- Linux v6.10.0-0.rc7.34afb82a3c67 Resolves: * Mon Jul 08 2024 Fedora Kernel Team [6.10.0-0.rc7.4376e966ecb7.58] diff --git a/kernel.spec b/kernel.spec index 617f7e508..836f143ef 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.10.0 %define specversion 6.10.0 %define patchversion 6.10 -%define pkgrelease 0.rc7.20240709git4376e966ecb7.59 +%define pkgrelease 0.rc7.20240711git9d9a2f29aefd.61 %define kversion 6 -%define tarfile_release 6.10-rc7-3-g4376e966ecb7 +%define tarfile_release 6.10-rc7-76-g9d9a2f29aefd # This is needed to do merge window version magic %define patchlevel 10 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.20240709git4376e966ecb7.59%{?buildid}%{?dist} +%define specrelease 0.rc7.20240711git9d9a2f29aefd.61%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.10.0 @@ -4043,8 +4043,15 @@ fi\ # # %changelog -* Tue Jul 09 2024 Fedora Kernel Team [6.10.0-0.rc7.4376e966ecb7.59] +* Thu Jul 11 2024 Fedora Kernel Team [6.10.0-0.rc7.9d9a2f29aefd.61] +- fedora: disable CONFIG_DRM_WERROR (Patrick Talbert) + +* Thu Jul 11 2024 Fedora Kernel Team [6.10.0-0.rc7.9d9a2f29aefd.60] +- Linux v6.10.0-0.rc7.9d9a2f29aefd + +* Wed Jul 10 2024 Fedora Kernel Team [6.10.0-0.rc7.34afb82a3c67.59] - not upstream: drop openssl ENGINE API usage (Jan Stancek) +- Linux v6.10.0-0.rc7.34afb82a3c67 * Mon Jul 08 2024 Fedora Kernel Team [6.10.0-0.rc7.4376e966ecb7.58] - Also remove the zfcpdump BASE_SMALL config (Justin M. Forbes) diff --git a/patch-6.10-redhat.patch b/patch-6.10-redhat.patch index 68133b957..7cc3b4516 100644 --- a/patch-6.10-redhat.patch +++ b/patch-6.10-redhat.patch @@ -2278,7 +2278,7 @@ index 17cccd14765f..7f0cef737224 100644 }; MODULE_DEVICE_TABLE(pci, qla4xxx_pci_tbl); diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index 6b64af7d4927..b48acd6689e3 100644 +index 1b7561abe05d..3490721d34d1 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -120,6 +120,14 @@ static const char *sd_cache_types[] = { @@ -2296,7 +2296,7 @@ index 6b64af7d4927..b48acd6689e3 100644 static void sd_set_flush_flag(struct scsi_disk *sdkp) { bool wc = false, fua = false; -@@ -4253,6 +4261,11 @@ static int __init init_sd(void) +@@ -4252,6 +4260,11 @@ static int __init init_sd(void) goto err_out_class; } diff --git a/sources b/sources index 76196e115..4b7478647 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.10-rc7-3-g4376e966ecb7.tar.xz) = 30c212d900ae3c714f1cb508b8dd93f99a5e142cd0958301cd1043e72348a65e31d1fbe22198431f7e763aeaff584b9024c056c535779e491acf5cb4608d0f58 -SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = 7041030c6187f3c17beffc5775857aab700696737e353ea7f620b6aca6f9743534667f1e5fbd6dc9397c47c82031e66a230a9df5ba33605d0e1c71cbaa0121c1 -SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 714adeee8e4258e14367915d851e7feb92307f5f387a99fea17f981c4ab1ab5d8ffe7b0e650ebdd0db2da8e3a4ec8e63fe5a66babaa7643a65313955a7244058 +SHA512 (linux-6.10-rc7-76-g9d9a2f29aefd.tar.xz) = d282553fa96544009c9e840c6bb35f744427b928a16876de1d7d7cee32d5f841634df73af79ddad9b23c8bdae0c72127258bafa65a09a1c23608d4242d86ea5d +SHA512 (kernel-abi-stablelists-6.10.0.tar.xz) = 972e0146770c57d830de0f7d5361533cb8bbf2ed8ee0b8f6936bb062c807c669773de2f57d7cc1a52d3c44b0d9c7cb9dcd316c4dd0419176868cabe8ec1c569f +SHA512 (kernel-kabi-dw-6.10.0.tar.xz) = 98eba49335fbab7fc6cb926ae8c0d6fd66acea2e273e1dad93950f69ede5dbb5d083869f34b4bb84c67f2cfbd6c2c69313fb259fd35e9fcae453f2e6735b9c83