diff --git a/Makefile.rhelver b/Makefile.rhelver index 045195d74..5da85be4c 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 = 53 +RHEL_RELEASE = 56 # # RHEL_REBASE_NUM diff --git a/kernel.changelog b/kernel.changelog index 8066a6ec4..9ef2f8233 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,15 @@ +* Mon Sep 09 2024 Fedora Kernel Team [6.11.0-0.rc7.56] +- Linux v6.11.0-0.rc7 +Resolves: + +* Sun Sep 08 2024 Fedora Kernel Team [6.11.0-0.rc6.d1f2d51b711a.55] +- Linux v6.11.0-0.rc6.d1f2d51b711a +Resolves: + +* Sat Sep 07 2024 Fedora Kernel Team [6.11.0-0.rc6.b31c44928842.54] +- Linux v6.11.0-0.rc6.b31c44928842 +Resolves: + * Fri Sep 06 2024 Fedora Kernel Team [6.11.0-0.rc6.b831f83e40a2.53] - Linux v6.11.0-0.rc6.b831f83e40a2 Resolves: diff --git a/kernel.spec b/kernel.spec index fd1aff7d7..2ff1eb75d 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.rc6.20240906gitb831f83e40a2.53 +%define pkgrelease 0.rc7.56 %define kversion 6 -%define tarfile_release 6.11-rc6-183-gb831f83e40a2 +%define tarfile_release 6.11-rc7 # This is needed to do merge window version magic %define patchlevel 11 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc6.20240906gitb831f83e40a2.53%{?buildid}%{?dist} +%define specrelease 0.rc7.56%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.11.0 @@ -4111,6 +4111,15 @@ fi\ # # %changelog +* Mon Sep 09 2024 Fedora Kernel Team [6.11.0-0.rc7.56] +- Linux v6.11.0-0.rc7 + +* Sun Sep 08 2024 Fedora Kernel Team [6.11.0-0.rc6.d1f2d51b711a.55] +- Linux v6.11.0-0.rc6.d1f2d51b711a + +* Sat Sep 07 2024 Fedora Kernel Team [6.11.0-0.rc6.b31c44928842.54] +- Linux v6.11.0-0.rc6.b31c44928842 + * Fri Sep 06 2024 Fedora Kernel Team [6.11.0-0.rc6.b831f83e40a2.53] - Linux v6.11.0-0.rc6.b831f83e40a2 diff --git a/patch-6.11-redhat.patch b/patch-6.11-redhat.patch index c1a968dda..66946a849 100644 --- a/patch-6.11-redhat.patch +++ b/patch-6.11-redhat.patch @@ -193,7 +193,7 @@ index 000000000000..7465c78a90e6 + +endmenu diff --git a/Makefile b/Makefile -index b1f3bf584d4a..6b7bbf0c3e2e 100644 +index 2966d5fbbf17..433b17f4a986 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1990,7 +1990,7 @@ index a00671b58701..eeef2766b8b3 100644 if (ret < 0) goto err_allowedips; diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index 0dc8bcc664f2..6c524e09b0d5 100644 +index 983909a600ad..28e59054b7c6 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -262,6 +262,9 @@ void nvme_delete_ctrl_sync(struct nvme_ctrl *ctrl) @@ -2060,7 +2060,7 @@ index 0dc8bcc664f2..6c524e09b0d5 100644 #ifdef CONFIG_NVME_HOST_AUTH queue_work(nvme_wq, &ctrl->dhchap_auth_work); diff --git a/drivers/nvme/host/multipath.c b/drivers/nvme/host/multipath.c -index 91d9eb3c22ef..d44cdba1ffea 100644 +index 518e22dd4f9b..af7d1591e9c6 100644 --- a/drivers/nvme/host/multipath.c +++ b/drivers/nvme/host/multipath.c @@ -83,14 +83,10 @@ void nvme_mpath_start_freeze(struct nvme_subsystem *subsys) @@ -2096,7 +2096,7 @@ index 91d9eb3c22ef..d44cdba1ffea 100644 spin_lock_irqsave(&ns->head->requeue_lock, flags); for (bio = req->bio; bio; bio = bio->bi_next) { -@@ -998,8 +1004,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) +@@ -1000,8 +1006,7 @@ int nvme_mpath_init_identify(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) int error = 0; /* check if multipath is enabled and we have the capability */ diff --git a/sources b/sources index 088e1ec3d..2ee58683e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.11-rc6-183-gb831f83e40a2.tar.xz) = b5d123a82ea43f460217c8f0ed2a9a5830d844a51472ca4e6bce3c8e877b0155ada5b973d532e87054d014b2c494522719ed3aea731f6072b9e30e0cf533bd68 -SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = f9069aaf538a472c8c8bed53eeb4c982982201034e50bf479ffe2574aec7825479b9ca01f3d6758a0d92655ad4ebf5ce0d6ad09bc7c074625c64b7a1e2ca1bc6 -SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = e558790f22d6879d9006ea59634a93af465c94c4ae2587f1b9d14c5f62f52cadedd62b30e100d528ea44bb7479ed72c3a6b4983627a3f53ff9584fd3164d8dc6 +SHA512 (linux-6.11-rc7.tar.xz) = 6d0afb7b215e6eca33aac0dc7a2ca7720daa6f2699503c9017344b0d58d3b5341d17eb41bffbabffba3f824d9f86a224db7f2b99c3f5de93a4cbe588a9074ad4 +SHA512 (kernel-abi-stablelists-6.11.0.tar.xz) = d62c00e84ec79616c0d4071cfe6f62c81bc2f6cfca90e6d1def851471b0862b54c842193cfdae272e737faeb8c21d5106e78da719655ac2629b84f6405e02c25 +SHA512 (kernel-kabi-dw-6.11.0.tar.xz) = 7066713fe4fa326f84189ee588808fab4b34855bef653f67948c86310f509bf08c7c2d87cf930fb0107b865b56ef8f3257d50c5c057c52a657a2a146ea13a325