diff --git a/Patchlist.changelog b/Patchlist.changelog index fcdffd87f..d4f17e952 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,5 +1,5 @@ -https://gitlab.com/cki-project/kernel-ark/-/commit/1ed1cc8284c488922896c3542cce023b25f8857d - 1ed1cc8284c488922896c3542cce023b25f8857d Revert "cpupower: Bump soname version" +https://gitlab.com/cki-project/kernel-ark/-/commit/26d0fb4c939d130216d0cc2ea6e11bc949f47685 + 26d0fb4c939d130216d0cc2ea6e11bc949f47685 Revert "cpupower: Bump soname version" https://gitlab.com/cki-project/kernel-ark/-/commit/7c261c4b600417524d07c5494a381e58abe404b1 7c261c4b600417524d07c5494a381e58abe404b1 drm/nouveau/fb: restore init() for ramgp102 diff --git a/kernel.changelog b/kernel.changelog index 47711169a..df4b3325f 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,7 @@ +* Fri Oct 04 2024 Augusto Caringi [6.10.13-0] +- Linux v6.10.13 +Resolves: + * Mon Sep 30 2024 Augusto Caringi [6.10.12-0] - Linux v6.10.12 Resolves: diff --git a/kernel.spec b/kernel.spec index 8dbdf763d..f4cfcd876 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.10.12 -%define specversion 6.10.12 +%define specrpmversion 6.10.13 +%define specversion 6.10.13 %define patchversion 6.10 %define pkgrelease 100 %define kversion 6 -%define tarfile_release 6.10.12 +%define tarfile_release 6.10.13 # This is needed to do merge window version magic %define patchlevel 10 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 100%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.10.12 +%define kabiversion 6.10.13 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -4043,11 +4043,14 @@ fi\ # # %changelog -* Mon Sep 30 2024 Augusto Caringi [6.10.12-100] +* Fri Oct 04 2024 Augusto Caringi [6.10.13-100] - Turn off libbpf dynamic for perf on F39 (Justin M. Forbes) - Revert "cpupower: Bump soname version" (Justin M. Forbes) - Drop soname for libcpupower.so since we reverted the bump (Justin M. Forbes) +* Fri Oct 04 2024 Augusto Caringi [6.10.13-0] +- Linux v6.10.13 + * Mon Sep 30 2024 Augusto Caringi [6.10.12-0] - Linux v6.10.12 diff --git a/patch-6.10-redhat.patch b/patch-6.10-redhat.patch index a4fc9e85c..99ddeafab 100644 --- a/patch-6.10-redhat.patch +++ b/patch-6.10-redhat.patch @@ -65,7 +65,7 @@ index eec8df1dde06a..88f49dd10cd06 100644 ... PPC KVM_REG_PPC_TM_GPR31 64 diff --git a/Makefile b/Makefile -index 175d7f27ea32a..52eef3d589e67 100644 +index 93731d0b1a04a..81291ebb3aa4f 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -104,7 +104,7 @@ index ee5115252aac4..7f3796df84041 100644 The VM uses one page of physical memory for each page table. For systems with a lot of processes, this can use a lot of diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index 11bbdc15c6e5e..9cecc1448e3c6 100644 +index cd9772b1fd95e..f3b3d8493c1c2 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1364,7 +1364,7 @@ endchoice @@ -1659,10 +1659,10 @@ index 61750cc98d705..a0e9a71580b5d 100644 static const struct ipu_property_names prop_names = { diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 568410e64ce64..6afbaee839503 100644 +index 206b76156c051..42a6117c139db 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -4433,6 +4433,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, +@@ -4446,6 +4446,30 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9000, DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 0x9084, quirk_bridge_cavm_thrx2_pcie_root); @@ -1694,7 +1694,7 @@ index 568410e64ce64..6afbaee839503 100644 * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero) * class code. Fix it. diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index 7d2a294ebc3d7..c2536099932b6 100644 +index 5dd100175ec61..b7f3cb9bb3899 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -120,6 +120,14 @@ static const char *sd_cache_types[] = { @@ -1820,10 +1820,10 @@ index 418e555459da7..fdd941287ae1d 100644 enum efi_secureboot_mode efi_get_secureboot_mode(efi_get_variable_t *get_var) { diff --git a/include/linux/lsm_hook_defs.h b/include/linux/lsm_hook_defs.h -index 855db460e08bc..7a8c28cd7510d 100644 +index 19c333fafe113..db33ee7f55d54 100644 --- a/include/linux/lsm_hook_defs.h +++ b/include/linux/lsm_hook_defs.h -@@ -438,6 +438,8 @@ LSM_HOOK(int, 0, bpf_token_capable, const struct bpf_token *token, int cap) +@@ -439,6 +439,8 @@ LSM_HOOK(int, 0, bpf_token_capable, const struct bpf_token *token, int cap) #endif /* CONFIG_BPF_SYSCALL */ LSM_HOOK(int, 0, locked_down, enum lockdown_reason what) @@ -2046,10 +2046,10 @@ index cd84d8ea1dfbf..e4c70a0312bc8 100644 const struct lsm_id lockdown_lsmid = { diff --git a/security/security.c b/security/security.c -index 8cee5b6c6e6d5..489e25946bf96 100644 +index 43166e341526c..b8cf110aeb589 100644 --- a/security/security.c +++ b/security/security.c -@@ -5596,6 +5596,18 @@ int security_locked_down(enum lockdown_reason what) +@@ -5630,6 +5630,18 @@ int security_locked_down(enum lockdown_reason what) } EXPORT_SYMBOL(security_locked_down); diff --git a/sources b/sources index 9c3e43c78..b9d1007f5 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.5.12.tar.bz2) = 7130ba0d72e398ae63bd0192e5e765885d8b932ff10c22f214821387588c358a21c8460561993baab0e5cd48afbad08db822cc49e5e3ae2d927b328de2072e7a SHA512 (kernel-kabi-dw-6.5.12.tar.bz2) = 7fc7372de576d1f3602abe70483edf30cf635a6d4175261bb44e1b7d4b413bc045b1e2affc0dbe6bf710a7c10b4a5c26c7fd47d8b8e7fe4bee2a25e2fd80b13a -SHA512 (linux-6.10.12.tar.xz) = 01d15b10b7b6d52cc5be7f43010dc6de875724994ae2a0910b0e506d4c5ca04cbb236de8c19edae9deee3e8acda09fdab04a7e5ec22b4a4e46c9e73c39b1fdae -SHA512 (kernel-abi-stablelists-6.10.12.tar.xz) = 33b02b968af331b07096666bcb86b12c5a96d1d2ae119570268d2b75c12d01708f7b7061c9c59d9114ed21781ea8047c8f48fddc106b7ae3422c2da9a7da3792 -SHA512 (kernel-kabi-dw-6.10.12.tar.xz) = 9a864058376a5d27ed6d15c34e649a6d2bddeb913cc8df9658850e9f9ccdb85a48fca1a36c8d904fe060a0076c256bd12db08819f0ce348e165068e55e2dd377 +SHA512 (linux-6.10.13.tar.xz) = a85230c4e8b0c39f0fb1bf2719934b0e3987bd3a5fe3c6d77daedb6e50b50fee963ea558868e8aae6b97cee5fb1e8f7336527ea04dce620d35843f367a666c5b +SHA512 (kernel-abi-stablelists-6.10.13.tar.xz) = 06290621219ae50e0b2c7dba9e487342e128ddcc6f41e528449832b2eefb1656837ebc2b0096a8df82329071c41ea4152d8ed032b6f4de61aafd43b460419fb8 +SHA512 (kernel-kabi-dw-6.10.13.tar.xz) = 0c5c76285182415fbf703aafd0a9e9274bb3e6ed9ff8516d021b5fd7b7ff4482f65cd3934a5da417782f1e82f00f9c0f751c051e525958821e252cb25f39ff43