diff --git a/Patchlist.changelog b/Patchlist.changelog index 818ebfe6a..b924b8fbd 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -"https://gitlab.com/cki-project/kernel-ark/-/commit"/42eb0a19656b95eb4755da41dc64e1cef1ddb351 - 42eb0a19656b95eb4755da41dc64e1cef1ddb351 Revert "cpupower: Bump soname version" +"https://gitlab.com/cki-project/kernel-ark/-/commit"/a1ca85b98a968e15f396045b3cf76199261c4410 + a1ca85b98a968e15f396045b3cf76199261c4410 Revert "cpupower: Bump soname version" "https://gitlab.com/cki-project/kernel-ark/-/commit"/9ba38d5f5c49d3f4a9e429d05aa73cb397db5071 9ba38d5f5c49d3f4a9e429d05aa73cb397db5071 Revert "Bluetooth: hci_qca: Set BDA quirk bit if fwnode exists in DT" diff --git a/kernel.changelog b/kernel.changelog index 061eb2473..46d12cc94 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,7 @@ +* Thu Apr 04 2024 Justin M. Forbes [6.8.4-0] +- Linux v6.8.4 +Resolves: + * Wed Apr 03 2024 Justin M. Forbes [6.8.3-0] - Fix up redhat directory for stable reabses (Justin M. Forbes) - Add some CVE fixes for 6.8.3 (Justin M. Forbes) diff --git a/kernel.spec b/kernel.spec index 027615c25..771e02a19 100644 --- a/kernel.spec +++ b/kernel.spec @@ -160,18 +160,18 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specrpmversion 6.8.3 -%define specversion 6.8.3 +%define specrpmversion 6.8.4 +%define specversion 6.8.4 %define patchversion 6.8 %define pkgrelease 100 %define kversion 6 -%define tarfile_release 6.8.3 +%define tarfile_release 6.8.4 # This is needed to do merge window version magic %define patchlevel 8 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 100%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.8.3 +%define kabiversion 6.8.4 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -3959,10 +3959,13 @@ fi\ # # %changelog -* Wed Apr 03 2024 Justin M. Forbes [6.8.3-100] +* Thu Apr 04 2024 Justin M. Forbes [6.8.4-100] - Revert "cpupower: Bump soname version" (Justin M. Forbes) - Drop soname for libcpupower.so since we reverted the bump (Justin M. Forbes) +* Thu Apr 04 2024 Justin M. Forbes [6.8.4-0] +- Linux v6.8.4 + * Wed Apr 03 2024 Justin M. Forbes [6.8.3-0] - Fix up redhat directory for stable reabses (Justin M. Forbes) - Add some CVE fixes for 6.8.3 (Justin M. Forbes) diff --git a/patch-6.8-redhat.patch b/patch-6.8-redhat.patch index 5a71e50db..7214ec466 100644 --- a/patch-6.8-redhat.patch +++ b/patch-6.8-redhat.patch @@ -41,7 +41,7 @@ 40 files changed, 675 insertions(+), 190 deletions(-) diff --git a/Makefile b/Makefile -index a78379891d22..71cc94dc40c0 100644 +index c436247d750c..fba81833741a 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ diff --git a/sources b/sources index 164892bb4..1661bf6ca 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.5.12.tar.bz2) = ea72bdfb5065f430c0b7076ba49f8fbc1b16f861dc4182f1ee5bc8a809f8f3103d97766e5719354f8163a77235a759a65cc7d4efc66e314dcc658ceda6a77016 SHA512 (kernel-kabi-dw-6.5.12.tar.bz2) = 7fc7372de576d1f3602abe70483edf30cf635a6d4175261bb44e1b7d4b413bc045b1e2affc0dbe6bf710a7c10b4a5c26c7fd47d8b8e7fe4bee2a25e2fd80b13a -SHA512 (linux-6.8.3.tar.xz) = 0aaee93f869ce314290adb5aa70352f04a292edd55060598e27fdc0ed65ec1dea54263a91c8d9b8dc289657f0330e26fc9bef18c0b988f5b318ab3f65e0f35d2 -SHA512 (kernel-abi-stablelists-6.8.3.tar.xz) = 2de058c4f1eae0bc61a8d08877167895c1e781cc7da160d4b7d13544d4db51579f3654d9bd3bf97985b8bd1704bda2c2fa08fa11ccfcab89f9d119f560735243 -SHA512 (kernel-kabi-dw-6.8.3.tar.xz) = 0062b7c960734eb41459d5d8a8581d8ac9fbc16ed1f39ff9ab122de47ee4a6fcf4fb82ccf1b4669fb920599220eb765dc35e7d449ca7fab1bdfbbf087841d7df +SHA512 (linux-6.8.4.tar.xz) = 364d68a76abc1eb7360e155bfae7431d9b1d88289b053c9d06eca685e7ba38100663b43d4e4c274635baaa8fe85cabb25e0d397dbe81010a5f6848b183fdcac3 +SHA512 (kernel-abi-stablelists-6.8.4.tar.xz) = 2d218f58a78dcdc5627319751ace5bcc85df9e2e72ea0a68c50d5f2695c6b451ecd5dbf1b7cdd1ec5621bba8fe209051c200c8780c93c06a4453e25fbffcc30d +SHA512 (kernel-kabi-dw-6.8.4.tar.xz) = 44aa3771a2523baaa928fb7d340f0945c24da559d1eff2a03f31fb8b5b0c4f366fac30cba5ae60c28a5884b88db51f4f83c512455062b8aa0451efb78d182452