diff --git a/Makefile.rhelver b/Makefile.rhelver index 9eeb9b728..be7005581 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 = 62 +RHEL_RELEASE = 64 # # RHEL_REBASE_NUM diff --git a/kernel.changelog b/kernel.changelog index 82ff4dc99..b70e156e7 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,11 @@ +* Mon May 13 2024 Fedora Kernel Team [6.9.0-64] +- Linux v6.9.0 +Resolves: + +* Sat May 11 2024 Fedora Kernel Team [6.9.0-0.rc7.cf87f46fd34d.63] +- Linux v6.9.0-0.rc7.cf87f46fd34d +Resolves: + * Fri May 10 2024 Fedora Kernel Team [6.9.0-0.rc7.448b3fe5a0ea.62] - redhat: make filtermods.py less verbose by default (Jan Stancek) - Linux v6.9.0-0.rc7.448b3fe5a0ea diff --git a/kernel.spec b/kernel.spec index 59f0980c0..a5d97e75a 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.9.0 %define specversion 6.9.0 %define patchversion 6.9 -%define pkgrelease 0.rc7.20240510git448b3fe5a0ea.62 +%define pkgrelease 64 %define kversion 6 -%define tarfile_release 6.9-rc7-117-g448b3fe5a0ea +%define tarfile_release 6.9 # This is needed to do merge window version magic %define patchlevel 9 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.20240510git448b3fe5a0ea.62%{?buildid}%{?dist} +%define specrelease 64%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.9.0 @@ -3940,6 +3940,12 @@ fi\ # # %changelog +* Mon May 13 2024 Fedora Kernel Team [6.9.0-64] +- Linux v6.9.0 + +* Sat May 11 2024 Fedora Kernel Team [6.9.0-0.rc7.cf87f46fd34d.63] +- Linux v6.9.0-0.rc7.cf87f46fd34d + * Fri May 10 2024 Fedora Kernel Team [6.9.0-0.rc7.448b3fe5a0ea.62] - redhat: make filtermods.py less verbose by default (Jan Stancek) - Linux v6.9.0-0.rc7.448b3fe5a0ea diff --git a/patch-6.9-redhat.patch b/patch-6.9-redhat.patch index 2504cab11..503d779be 100644 --- a/patch-6.9-redhat.patch +++ b/patch-6.9-redhat.patch @@ -136,7 +136,7 @@ index 000000000000..7465c78a90e6 + +endmenu diff --git a/Makefile b/Makefile -index d51d411d44a8..86aabffe78aa 100644 +index 967e97878ecd..869a8ae5bcee 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1826,10 +1826,10 @@ index d16e976ae1a4..4dd28efacef0 100644 if (!ctrl->max_namespaces || diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h -index b564c5f1450c..37a1b9bc7ec3 100644 +index 05532c281177..a2138cba0ec3 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h -@@ -941,6 +941,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); +@@ -946,6 +946,7 @@ void nvme_mpath_wait_freeze(struct nvme_subsystem *subsys); void nvme_mpath_start_freeze(struct nvme_subsystem *subsys); void nvme_mpath_default_iopolicy(struct nvme_subsystem *subsys); void nvme_failover_req(struct request *req); @@ -1837,7 +1837,7 @@ index b564c5f1450c..37a1b9bc7ec3 100644 void nvme_kick_requeue_lists(struct nvme_ctrl *ctrl); int nvme_mpath_alloc_disk(struct nvme_ctrl *ctrl,struct nvme_ns_head *head); void nvme_mpath_add_disk(struct nvme_ns *ns, __le32 anagrpid); -@@ -983,6 +984,9 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl) +@@ -988,6 +989,9 @@ static inline bool nvme_ctrl_use_ana(struct nvme_ctrl *ctrl) static inline void nvme_failover_req(struct request *req) { } diff --git a/sources b/sources index bc85775d0..3bd4f3d5e 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.9-rc7-117-g448b3fe5a0ea.tar.xz) = 40ed56b1475b7b97d318d4297573e59e7ee53ab3015144a3e7fb4dad82ced5565478626425fd4345c4e7d56e7834ab89620206059122f92cc205f50e13527369 -SHA512 (kernel-abi-stablelists-6.9.0.tar.xz) = 191c553a3fbff4a8d4b5f68c126844cd886263b01f4446bafe0ab30176ae703b6c0a5e5fa1e7f940f0e4fccf3a6198001c38b4b8b2fdf16eb1dce8754b85c309 -SHA512 (kernel-kabi-dw-6.9.0.tar.xz) = 3ab624d31c3234aba35d930cc6ac44e5a37cd9891c8798eac49a57eb8a604d2c2e6d4a1ae77454bd1c4f915af1bb8645df18961e93a5aec1abea908198471a77 +SHA512 (linux-6.9.tar.xz) = dbd2c816739f45bf6f706b14efa252cc6c9787d9a0f63a844b80a4aed6681c65b55c8c01a9b04d1891fbe02d0c5c9e14e25f520a05354f9b260787e5fe76f24d +SHA512 (kernel-abi-stablelists-6.9.0.tar.xz) = cb7048765f958046066cb40eab726244c473b0d59594edeba9ea95b38c43da0264d36ad6abaee9b316f4141a30477137a7d05c1b060e7f0675fd04ef82f50f62 +SHA512 (kernel-kabi-dw-6.9.0.tar.xz) = 83004208d610846fab7ddafa305a01557be86a5a4da95d30f55a274d9e9ea3a6a18de5e22203219e0d99b136c9791384b87288ae4ea238d8af6d37c90c7b4af7