diff --git a/Makefile.rhelver b/Makefile.rhelver index c9670fb00..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 = 23 +RHEL_RELEASE = 26 # # RHEL_REBASE_NUM diff --git a/kernel.spec b/kernel.spec index 228eca75b..50d0456bb 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.7.0 %define specversion 6.7.0 %define patchversion 6.7 -%define pkgrelease 0.rc2.20231122gitc2d5304e6c64.23 +%define pkgrelease 0.rc2.20231125git0f5cc96c367f.26 %define kversion 6 -%define tarfile_release 6.7-rc2-14-gc2d5304e6c64 +%define tarfile_release 6.7-rc2-195-g0f5cc96c367f # This is needed to do merge window version magic %define patchlevel 7 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc2.20231122gitc2d5304e6c64.23%{?buildid}%{?dist} +%define specrelease 0.rc2.20231125git0f5cc96c367f.26%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.7.0 @@ -3714,8 +3714,15 @@ fi\ # # %changelog -* Wed Nov 22 2023 Justin M. Forbes [6.7.0-0.rc2.20231122gitc2d5304e6c64.23] +* Sat Nov 25 2023 Fedora Kernel Team [6.7.0-0.rc2.0f5cc96c367f.26] +- Linux v6.7.0-0.rc2.0f5cc96c367f + +* Fri Nov 24 2023 Fedora Kernel Team [6.7.0-0.rc2.f1a09972a45a.25] +- Linux v6.7.0-0.rc2.f1a09972a45a + +* Thu Nov 23 2023 Fedora Kernel Team [6.7.0-0.rc2.9b6de136b5f0.24] - Turn on USB_DWC3 for Fedora (rhbz 2250955) (Justin M. Forbes) +- Linux v6.7.0-0.rc2.9b6de136b5f0 * Wed Nov 22 2023 Fedora Kernel Team [6.7.0-0.rc2.c2d5304e6c64.23] - redhat/configs: Move IOMMUFD to common (Alex Williamson) diff --git a/patch-6.7-redhat.patch b/patch-6.7-redhat.patch index 898927d33..52055c60e 100644 --- a/patch-6.7-redhat.patch +++ b/patch-6.7-redhat.patch @@ -204,10 +204,10 @@ index b0d00032479d..afb9544fb007 100644 /* * DIAG 308 support diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c -index cc364fce6aa9..f5709ee1047f 100644 +index ba75f6bee774..7d37ce1772f1 100644 --- a/arch/s390/kernel/ipl.c +++ b/arch/s390/kernel/ipl.c -@@ -2519,3 +2519,8 @@ int ipl_report_free(struct ipl_report *report) +@@ -2520,3 +2520,8 @@ int ipl_report_free(struct ipl_report *report) } #endif @@ -1671,7 +1671,7 @@ index ee4da9ab8013..d395d11eadc4 100644 if (ret < 0) goto err_allowedips; diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 88b54cdcbd68..8c304a6bb55d 100644 +index 46a4c9c5ea96..d106f73f44f1 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -251,6 +251,9 @@ void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) diff --git a/sources b/sources index 9e7f88e26..558a978eb 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6 -SHA512 (linux-6.7-rc2-14-gc2d5304e6c64.tar.xz) = 7d694844e84573f9ccad028ea7175fec702e8b00e9244f9749a0d92a609c1e64e0a42bdc33162b657c67d6ca7247457dbd1bab43c4a5e8ac9ec9f5856f5e44f0 -SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = 908d351ed64a373486f2ebfae607244e37c6fe124ceff8ac910ddea06acc943ce1eda59f4b25773c45b251b176229b70ead197e88e34ee383958d29b5ab4dabb -SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = 8ca309116cffac10c74f0103aa996f2ebd59f5f3eed40b4d95bad245ff363d6a5ce0ec973b6d3f48c21ce50a391314215d4776745e01f44072b0a7e4519d5e12 +SHA512 (linux-6.7-rc2-195-g0f5cc96c367f.tar.xz) = 8c4dff6d534c1bf37d8bd0fc76ee7fa6eac7db0b2d1f3c7bb7295dcc4afe2ed21ec0e99aa04a38f0055ec9f47e392b5764186f490205e7e62910a6ac5030c91c +SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = 8c53dc0d372a4e9a1ce2be397504b08e6e01def69a8c3b851c0c9488607d51798f5e71e41a02836f05964d1dc337771642f4009e354d6b8c4cc15491f08ca5bc +SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = e5522a4ab85aa8f95c377609554c3ed221a2c5b60f302800f1ec0725cbb556ef5eeb4164e1d4a1fb4f65e8493b5657fa2a9a6900504ce90ee139ede9142cf450