diff --git a/Makefile.rhelver b/Makefile.rhelver index 71911458c..f5b0b5535 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 = 60 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 0eca63472..af97092b9 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/b57ff83c206c815792a50aa0dc14cc293b1937da + b57ff83c206c815792a50aa0dc14cc293b1937da [redhat] rh_messages.h: mark mlx5 on Bluefield-3 as unmaintained + https://gitlab.com/cki-project/kernel-ark/-/commit/2a740e17e8b448f7189bc35eba53784ffd1344e4 2a740e17e8b448f7189bc35eba53784ffd1344e4 [redhat] rh_messages.h: initial driver and device lists diff --git a/kernel.changelog b/kernel.changelog index 9ffefad3b..4a10dca31 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,7 @@ +* Wed May 08 2024 Fedora Kernel Team [6.9.0-0.rc7.dccb07f2914c.60] +- Consolidate configs to common for 6.9 (Justin M. Forbes) +Resolves: + * Tue May 07 2024 Fedora Kernel Team [6.9.0-0.rc7.dccb07f2914c.59] - redhat/rhel_files: move tipc.ko and tipc_diag.ko to modules-extra (Xin Long) [RHEL-23931] - redhat: move amd-pstate-ut.ko to modules-internal (Jan Stancek) diff --git a/kernel.spec b/kernel.spec index 38d74e127..3f38f43ad 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.20240507gitdccb07f2914c.59 +%define pkgrelease 0.rc7.20240508gitdccb07f2914c.60 %define kversion 6 %define tarfile_release 6.9-rc7-12-gdccb07f2914c # 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.20240507gitdccb07f2914c.59%{?buildid}%{?dist} +%define specrelease 0.rc7.20240508gitdccb07f2914c.60%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.9.0 @@ -3936,6 +3936,9 @@ fi\ # # %changelog +* Wed May 08 2024 Fedora Kernel Team [6.9.0-0.rc7.dccb07f2914c.60] +- Consolidate configs to common for 6.9 (Justin M. Forbes) + * Tue May 07 2024 Fedora Kernel Team [6.9.0-0.rc7.dccb07f2914c.59] - redhat/rhel_files: move tipc.ko and tipc_diag.ko to modules-extra (Xin Long) [RHEL-23931] - redhat: move amd-pstate-ut.ko to modules-internal (Jan Stancek) diff --git a/patch-6.9-redhat.patch b/patch-6.9-redhat.patch index f2c727add..a9bec5068 100644 --- a/patch-6.9-redhat.patch +++ b/patch-6.9-redhat.patch @@ -3646,7 +3646,7 @@ index 000000000000..bb69e8965748 +} diff --git a/kernel/rh_messages.h b/kernel/rh_messages.h new file mode 100644 -index 000000000000..053aeb047617 +index 000000000000..5c44026c6c81 --- /dev/null +++ b/kernel/rh_messages.h @@ -0,0 +1,319 @@ @@ -3912,7 +3912,6 @@ index 000000000000..053aeb047617 + { 0x15B3, 0x100e, PCI_ANY_ID, PCI_ANY_ID }, + { 0x15B3, 0x100f, PCI_ANY_ID, PCI_ANY_ID }, + { 0x15B3, 0x1010, PCI_ANY_ID, PCI_ANY_ID }, -+ { 0x15B3, 0xA2DC, PCI_ANY_ID, PCI_ANY_ID }, + { 0x1000, 0x0064, PCI_ANY_ID, PCI_ANY_ID }, + { 0x1000, 0x0065, PCI_ANY_ID, PCI_ANY_ID }, + { 0x1000, 0x0070, PCI_ANY_ID, PCI_ANY_ID }, @@ -3948,6 +3947,7 @@ index 000000000000..053aeb047617 + { 0x1000, 0x0071, PCI_ANY_ID, PCI_ANY_ID }, + { 0x1000, 0x0073, PCI_ANY_ID, PCI_ANY_ID }, + { 0x1000, 0x0079, PCI_ANY_ID, PCI_ANY_ID }, ++ { 0x15B3, 0xA2DC, PCI_ANY_ID, PCI_ANY_ID }, + { 0x1000, 0x006E, PCI_ANY_ID, PCI_ANY_ID }, + { 0x1000, 0x0080, PCI_ANY_ID, PCI_ANY_ID }, + { 0x1000, 0x0081, PCI_ANY_ID, PCI_ANY_ID }, diff --git a/sources b/sources index 630536a85..4e39047d9 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-12-gdccb07f2914c.tar.xz) = 5120f14394d29550e656f5ce1b568a8a4d28ee3b58a2c8862141236bd1bd3330b2a40ec72761077f9e88ebed9053b1b1f9ba73f79c983d9558fc034995802d04 -SHA512 (kernel-abi-stablelists-6.9.0.tar.xz) = 6b109861728f9b369fd6360a4d27eeca4c25fae43164db6a9a34fa34b6ae75e9ad43dd96605d26ffa9eab1fabae22a0c5c75626b5aecb8795915459328587188 -SHA512 (kernel-kabi-dw-6.9.0.tar.xz) = 207c7f8adebce4bbfe3e1c9723360356ba151dba8e9dcac8ffc4af976f6e66cbb7eb1fefb23bce54a417b1df1a78c028eb4d3afcab1d3dbe950542055a7c0e77 +SHA512 (kernel-abi-stablelists-6.9.0.tar.xz) = f74794ae7e81c4d4e38b076b7b2e8950a44e7160ab420c21b2725b72a3abc32deaaab083580281849a49a62f3c80066479c399978a3fd3d11a5b0413524a5cad +SHA512 (kernel-kabi-dw-6.9.0.tar.xz) = 18380cacfe0577cd5d2d7da4ad1e5e8dc1dec06dc3ec465b9f9dbfba62a7dda1ed409a9a03ea53a89d85bac94a33c3d265d5d1b756f9341d35439d3ececd88b2