feat: update Linux to 6.1.25

Build virtio drivers into the kernel on arm64, there are issues loading virtio on arm64: * siderolabs/talos#7119 * siderolabs/talos#7123 Signed-off-by: Andrey Smirnov <andrey.smirnov@talos-systems.com>
siderolabs · Apr 26, 2023 · f37e520 · f37e520
1 parent 3920b16
commit f37e520
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/Pkgfile b/Pkgfile
@@ -68,9 +68,9 @@ vars:
   ipxe_sha512: b241fd32d9a2100f99334d9d09e2736af0ea724923f66693e574e480a616fed2cd127f6851bea1c80fd35792048700afcb18e42eb3c3d2b35816d3917cbfb0c2
 
   # renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
-  linux_version: 6.1.24
-  linux_sha256: aae6a7e38e33589011f5a5c0d7e087c8a26e3daf8d434432ee975ead90546504
-  linux_sha512: 8dd946ae969e3a51d82f8c5383cb4af8ec457b5ad2174a09a39f86db9c3d5992b9c394652780ad6f31aa6a2d90a9768bf86fc9d15a63bb6bda1e1a031554d83a
+  linux_version: 6.1.25
+  linux_sha256: cb72436ceb15086ae3df65e590592030692a9237a37d64105478eb5a72493091
+  linux_sha512: 9060903458d10a836dd88c8c6ef30ef0bbcf543a166a40a98ec4710731702d89922fbdbbebee5a9f85c16e3fb5e005d55d675616b90bb9c700a7113f9155fff0
 
   # renovate: datasource=git-tags extractVersion=^v(?<version>.*)$ depName=git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git
   kmod_version: 30

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.1.24 Kernel Configuration
+# Linux/x86 6.1.25 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
 CONFIG_CC_IS_GCC=y
@@ -1011,6 +1011,7 @@ CONFIG_SECRETMEM=y
 # CONFIG_USERFAULTFD is not set
 CONFIG_LRU_GEN=y
 # CONFIG_LRU_GEN_ENABLED is not set
+# CONFIG_LRU_GEN_STATS is not set
 
 #
 # Data Access Monitoring

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.1.24 Kernel Configuration
+# Linux/arm64 6.1.25 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
 CONFIG_CC_IS_GCC=y
@@ -1057,6 +1057,7 @@ CONFIG_ARCH_HAS_PTE_SPECIAL=y
 # CONFIG_USERFAULTFD is not set
 CONFIG_LRU_GEN=y
 # CONFIG_LRU_GEN_ENABLED is not set
+# CONFIG_LRU_GEN_STATS is not set
 
 #
 # Data Access Monitoring
@@ -5939,15 +5940,15 @@ CONFIG_VMGENID=y
 # CONFIG_NITRO_ENCLAVES is not set
 CONFIG_VIRTIO_ANCHOR=y
 CONFIG_VIRTIO=y
-CONFIG_VIRTIO_PCI_LIB=m
-CONFIG_VIRTIO_PCI_LIB_LEGACY=m
+CONFIG_VIRTIO_PCI_LIB=y
+CONFIG_VIRTIO_PCI_LIB_LEGACY=y
 CONFIG_VIRTIO_MENU=y
-CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_PCI_LEGACY=y
-CONFIG_VIRTIO_PMEM=m
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_VIRTIO_INPUT=m
-CONFIG_VIRTIO_MMIO=m
+CONFIG_VIRTIO_PMEM=y
+CONFIG_VIRTIO_BALLOON=y
+CONFIG_VIRTIO_INPUT=y
+CONFIG_VIRTIO_MMIO=y
 CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
 CONFIG_VIRTIO_DMA_SHARED_BUFFER=y
 # CONFIG_VDPA is not set