feat: update Linux to 6.12.5

Latest Linux 6.12.x for Talos 1.9.0. Signed-off-by: Andrey Smirnov <[email protected]> (cherry picked from commit c40a9e9)
siderolabs · Dec 16, 2024 · 9576b97 · 9576b97
1 parent 7082133
commit 9576b97
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/Pkgfile b/Pkgfile
@@ -73,9 +73,9 @@ vars:
   ipxe_sha512: c5b8ec789fad016d3dfa325a601857e357ecd26fd353d8d657901898817ee1d7dc76d513811c81fdee2a9dc001af4c6d7285f736db9a1d6abd890e8e09b57c27
 
   # renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
-  linux_version: 6.12.4
-  linux_sha256: 6f35f821433d8421be7167990747c7c4a0c451958fb96883446301af13d71152
-  linux_sha512: 6784c451b75fc3ae8517b22c151113317cff8101abfe5ddedcb3c6f1df4576de31def36b6687445d8e54ec428b69bd0af1adb50435b51b7baf9a065b7ad3e047
+  linux_version: 6.12.5
+  linux_sha256: 39207fce1ce42838e085261bae0af5ce4a0843aa777cfc0f5c49bc7729602bcd
+  linux_sha512: 1331df19fda83120d2b5491b6978cce4003229892b4fa40d5b8c10910293207cc36ec212621583e6c848f8ba42179637437f03df353aabe941922846f84a2371
 
   # renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git
   kmod_version: 33

diff --git a/kernel/build/config-amd64 b/kernel/build/config-amd64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.12.4 Kernel Configuration
+# Linux/x86 6.12.5 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -84,7 +84,6 @@ CONFIG_SPARSE_IRQ=y
 
 CONFIG_CLOCKSOURCE_WATCHDOG=y
 CONFIG_ARCH_CLOCKSOURCE_INIT=y
-CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
 CONFIG_GENERIC_TIME_VSYSCALL=y
 CONFIG_GENERIC_CLOCKEVENTS=y
 CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
@@ -7055,8 +7054,6 @@ CONFIG_SCHED_INFO=y
 CONFIG_SCHEDSTATS=y
 # end of Scheduler Debugging
 
-# CONFIG_DEBUG_TIMEKEEPING is not set
-
 #
 # Lock Debugging (spinlocks, mutexes, etc...)
 #

diff --git a/kernel/build/config-arm64 b/kernel/build/config-arm64
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 6.12.4 Kernel Configuration
+# Linux/arm64 6.12.5 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 14.2.0"
 CONFIG_CC_IS_GCC=y
@@ -429,6 +429,7 @@ CONFIG_CAVIUM_ERRATUM_30115=y
 CONFIG_CAVIUM_TX2_ERRATUM_219=y
 CONFIG_FUJITSU_ERRATUM_010001=y
 CONFIG_HISILICON_ERRATUM_161600802=y
+CONFIG_HISILICON_ERRATUM_162100801=y
 CONFIG_QCOM_FALKOR_ERRATUM_1003=y
 CONFIG_QCOM_FALKOR_ERRATUM_1009=y
 CONFIG_QCOM_QDF2400_ERRATUM_0065=y
@@ -9560,8 +9561,6 @@ CONFIG_SCHED_INFO=y
 CONFIG_SCHEDSTATS=y
 # end of Scheduler Debugging
 
-# CONFIG_DEBUG_TIMEKEEPING is not set
-
 #
 # Lock Debugging (spinlocks, mutexes, etc...)
 #