From 34cd04385c71ca81a1278447cca0d49e0b1126ae Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 8 Feb 2024 11:39:07 -0600 Subject: [PATCH] kernel-6.8.0-0.rc3.20240208git047371968ffc.30 * Thu Feb 08 2024 Fedora Kernel Team [6.8.0-0.rc3.047371968ffc.30] - DO NOT MERGE: Revert Fix cursor planes with virtualized drivers series (Justin M. Forbes) - tools/rv: Fix Makefile compiler options for clang (Daniel Bristot de Oliveira) - tools/rtla: Fix Makefile compiler options for clang (Daniel Bristot de Oliveira) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 12 ++++++------ kernel.changelog | 6 +++++- kernel.spec | 11 +++++++---- sources | 6 +++--- 5 files changed, 22 insertions(+), 15 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 120602760..64f1f44ac 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 = 29 +RHEL_RELEASE = 30 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 894f93d7c..424ef972c 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,11 +1,11 @@ -"https://gitlab.com/cki-project/kernel-ark/-/commit"/08a6a23079c0a9812812d79f89a9d81acdad066c - 08a6a23079c0a9812812d79f89a9d81acdad066c DO NOT MERGE: Revert Fix cursor planes with virtualized drivers series +"https://gitlab.com/cki-project/kernel-ark/-/commit"/7abdc6e12ba9421fe79812c383e31ea67422851a + 7abdc6e12ba9421fe79812c383e31ea67422851a DO NOT MERGE: Revert Fix cursor planes with virtualized drivers series -"https://gitlab.com/cki-project/kernel-ark/-/commit"/886d313f92c471a339d525d88375b44fffbded24 - 886d313f92c471a339d525d88375b44fffbded24 tools/rv: Fix Makefile compiler options for clang +"https://gitlab.com/cki-project/kernel-ark/-/commit"/3931c85ba3d1631bece283f44cf72d20e3a249e6 + 3931c85ba3d1631bece283f44cf72d20e3a249e6 tools/rv: Fix Makefile compiler options for clang -"https://gitlab.com/cki-project/kernel-ark/-/commit"/b785c6a84a59cb8f73b92f400896b35b7a00ec2c - b785c6a84a59cb8f73b92f400896b35b7a00ec2c tools/rtla: Fix Makefile compiler options for clang +"https://gitlab.com/cki-project/kernel-ark/-/commit"/53ce3512ea2f0956fecde06146e42fdd23ff6b4b + 53ce3512ea2f0956fecde06146e42fdd23ff6b4b tools/rtla: Fix Makefile compiler options for clang "https://gitlab.com/cki-project/kernel-ark/-/commit"/00b18a7e395433017c0eabdd14a7c3db2c6d4d9a 00b18a7e395433017c0eabdd14a7c3db2c6d4d9a Fix up manual merge error in security.h diff --git a/kernel.changelog b/kernel.changelog index 6bf27b12e..0f706959e 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,9 +1,13 @@ -* Wed Feb 07 2024 Fedora Kernel Team [6.8.0-0.rc3.6d280f4d760e.29] +* Thu Feb 08 2024 Fedora Kernel Team [6.8.0-0.rc3.047371968ffc.30] - DO NOT MERGE: Revert Fix cursor planes with virtualized drivers series (Justin M. Forbes) - tools/rv: Fix Makefile compiler options for clang (Daniel Bristot de Oliveira) - tools/rtla: Fix Makefile compiler options for clang (Daniel Bristot de Oliveira) Resolves: +* Thu Feb 08 2024 Fedora Kernel Team [6.8.0-0.rc3.047371968ffc.29] +- Linux v6.8.0-0.rc3.047371968ffc +Resolves: + * Wed Feb 07 2024 Fedora Kernel Team [6.8.0-0.rc3.6d280f4d760e.28] - gitlab-ci: merge ark-latest fixes when running ELN pipelines (Michael Hofmann) - gitlab-ci: use all arches for container image gating (Michael Hofmann) diff --git a/kernel.spec b/kernel.spec index f10a97ef5..6070cb120 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.8.0 %define specversion 6.8.0 %define patchversion 6.8 -%define pkgrelease 0.rc3.20240207git6d280f4d760e.29 +%define pkgrelease 0.rc3.20240208git047371968ffc.30 %define kversion 6 -%define tarfile_release 6.8-rc3-10-g6d280f4d760e +%define tarfile_release 6.8-rc3-47-g047371968ffc # This is needed to do merge window version magic %define patchlevel 8 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc3.20240207git6d280f4d760e.29%{?buildid}%{?dist} +%define specrelease 0.rc3.20240208git047371968ffc.30%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.8.0 @@ -3839,11 +3839,14 @@ fi\ # # %changelog -* Wed Feb 07 2024 Fedora Kernel Team [6.8.0-0.rc3.6d280f4d760e.29] +* Thu Feb 08 2024 Fedora Kernel Team [6.8.0-0.rc3.047371968ffc.30] - DO NOT MERGE: Revert Fix cursor planes with virtualized drivers series (Justin M. Forbes) - tools/rv: Fix Makefile compiler options for clang (Daniel Bristot de Oliveira) - tools/rtla: Fix Makefile compiler options for clang (Daniel Bristot de Oliveira) +* Thu Feb 08 2024 Fedora Kernel Team [6.8.0-0.rc3.047371968ffc.29] +- Linux v6.8.0-0.rc3.047371968ffc + * Wed Feb 07 2024 Fedora Kernel Team [6.8.0-0.rc3.6d280f4d760e.28] - gitlab-ci: merge ark-latest fixes when running ELN pipelines (Michael Hofmann) - gitlab-ci: use all arches for container image gating (Michael Hofmann) diff --git a/sources b/sources index 0f81f8976..ee2c37bad 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.8-rc3-10-g6d280f4d760e.tar.xz) = 0f5288c7ee04c4751749653e3292e48417d429ba603eb22f5ab1150628266ad63c688985229d2241519d3d008b3b7fd388ec08ffd2aa1b529ee0fdfd689123a7 -SHA512 (kernel-abi-stablelists-6.8.0.tar.xz) = e3ef43a5ad8250bc839c01096f240915be4e5d802968b1274aff90c6aa8d9eb87382850b7f97b275b20da99218a5ccf9e93ae32caafd883c0b70826705c1c845 -SHA512 (kernel-kabi-dw-6.8.0.tar.xz) = 12a00649191c31782556cb36d4279c824160fc8b0e334f131969f3a3e0334cd5b9deaae0b38ac612d95c308afbb46b606c0f4732979b21cd3022628aa808fd5f +SHA512 (linux-6.8-rc3-47-g047371968ffc.tar.xz) = 15272b489c8c68065d043f0ad8c5d9de7ff195d808b88f2b76eb4462ed5e069274e53ed6e03d0d4cf1c7a7f9941e291c0be843f48fa6c542b53b5f837c9208f8 +SHA512 (kernel-abi-stablelists-6.8.0.tar.xz) = 944113515f6ca9d08b6763b91414d994810817bc40c197d01f18947d496ac727f5cfe88ec112dbc47fed0dff78732ee6977205b1ff774d0464c6f54773ba6577 +SHA512 (kernel-kabi-dw-6.8.0.tar.xz) = 2113a27ed027510d01069aa05721a16f3a32fb33b8a913c6f99f04eca103199aa3871f4e6a99c4c2c02e050dd7831b5bf488d24dc158ae79cd38725802fd6209