diff --git a/Makefile.rhelver b/Makefile.rhelver index e3e32f88f..931d6835d 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 = 54 # # RHEL_REBASE_NUM diff --git a/kernel.changelog.xz b/kernel.changelog.xz index f2a2f4c62..a58284ad3 100644 Binary files a/kernel.changelog.xz and b/kernel.changelog.xz differ diff --git a/kernel.spec b/kernel.spec index 2f61ae23b..4744615cd 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.rc6.20231222git24e0d2e527a3.52 +%define pkgrelease 0.rc7.54 %define kversion 6 -%define tarfile_release 6.7-rc6-176-g24e0d2e527a3 +%define tarfile_release 6.7-rc7 # This is needed to do merge window version magic %define patchlevel 7 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.20231222git24e0d2e527a3.52%{?buildid}%{?dist} +%define specrelease 0.rc7.54%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.7.0 @@ -3756,6 +3756,12 @@ fi\ # # %changelog +* Sun Dec 24 2023 Fedora Kernel Team [6.7.0-0.rc7.54] +- Linux v6.7.0-0.rc7 + +* Sat Dec 23 2023 Fedora Kernel Team [6.7.0-0.rc6.5254c0cbc92d.53] +- Linux v6.7.0-0.rc6.5254c0cbc92d + * Fri Dec 22 2023 Fedora Kernel Team [6.7.0-0.rc6.24e0d2e527a3.52] - fedora: a few cleanups and driver enablements (Peter Robinson) - fedora: arm64: cleanup Allwinner Pinctrl drivers (Peter Robinson) diff --git a/patch-6.7-redhat.patch b/patch-6.7-redhat.patch index 65f377bf9..24fab6ce0 100644 --- a/patch-6.7-redhat.patch +++ b/patch-6.7-redhat.patch @@ -127,7 +127,7 @@ index 000000000000..effb81d04bfd + +endmenu diff --git a/Makefile b/Makefile -index e78ee7db0729..2e2b327fd8d7 100644 +index ee995fc2b0e5..2a816326f2fb 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1673,7 +1673,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 8ebdfd623e0f..87955258aea6 100644 +index 60f14019f981..6f566e06c307 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 a27f1332c..12dcb85ad 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-rc6-176-g24e0d2e527a3.tar.xz) = 89c7eef8461516e2357de2b9be6fc8d99a5edc9cb21c2b314dd79d5202df928675c6a173ab13ed6d0b87d4f4c0e607d16cf4a21b04d1eca5d56454a8427935ed -SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = 03b82fc7bae310712dd4ecbd4f6b0b9b2fe792baf54ba9a35b9bcf5985a26516809456cc3d10dd1031d7204a81e0c08a9712220cf679148962259e463ee61057 -SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = ba034c82a2255be82a488020a046ca30c1737eb700d99e52f3ce2c6e301310b28eb83c5468c562295dc0f95ffd41d68a7f9ce7890e72476c5f4692dbfc308f38 +SHA512 (linux-6.7-rc7.tar.xz) = d4b77732ad04e46488dabeb20020602eee97c0248acc039b2fbe2b192a681930ac5fe9a51977464ba90260a0a488e1fa629058e2a4828872cc942fb528d6d7be +SHA512 (kernel-abi-stablelists-6.7.0.tar.xz) = 2a13c3c5223f9d8fa02647e5b43b73c668f87fc7443dc525ff69f733cda2aa98e930a7ad201a2dae6c728ac286b2258b6590cf436f44e8f85198730b28b976f2 +SHA512 (kernel-kabi-dw-6.7.0.tar.xz) = a39cdd949df87555e1500885860bce06ae08a8d18d2514cf505ebf78d14641e40ba91a90d853ce3919b3ef5090486101e75122a7baa2c373d5a1470a5f8eb73d