summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-02-01 08:49:08 +0100
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-02-01 09:14:09 +0000
commitdb1f6699bfc3c3148336b3270444e5cb339c293f (patch)
treeb55fcc143de1c0ab71de2c64fd6f7e7e7c33d2d7
parent425029722042faf7f3b9e94da369d737098f2798 (diff)
downloadvyos-build-db1f6699bfc3c3148336b3270444e5cb339c293f.tar.gz
vyos-build-db1f6699bfc3c3148336b3270444e5cb339c293f.zip
Kernel: T5887: update Linux Kernel to v6.6.15
(cherry picked from commit c910d5843ac4f7f96d9cb2d9c564f7fe8587c50f)
-rw-r--r--data/defaults.toml2
-rw-r--r--packages/linux-kernel/arch/x86/configs/vyos_defconfig27
2 files changed, 14 insertions, 15 deletions
diff --git a/data/defaults.toml b/data/defaults.toml
index 59563c53..4939077d 100644
--- a/data/defaults.toml
+++ b/data/defaults.toml
@@ -14,7 +14,7 @@ vyos_mirror = "http://dev.packages.vyos.net/repositories/sagitta"
vyos_branch = "sagitta"
release_train = "sagitta"
-kernel_version = "6.6.13"
+kernel_version = "6.6.15"
bootloaders = "syslinux,grub-efi"
squashfs_compression_type = "xz -Xbcj x86 -b 256k -always-use-fragments -no-recovery"
diff --git a/packages/linux-kernel/arch/x86/configs/vyos_defconfig b/packages/linux-kernel/arch/x86/configs/vyos_defconfig
index b42dec00..9446cdc1 100644
--- a/packages/linux-kernel/arch/x86/configs/vyos_defconfig
+++ b/packages/linux-kernel/arch/x86/configs/vyos_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.6.10 Kernel Configuration
+# Linux/x86 6.6.15 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (Debian 12.2.0-14) 12.2.0"
CONFIG_CC_IS_GCC=y
@@ -338,7 +338,6 @@ CONFIG_IOSF_MBI=y
CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
CONFIG_SCHED_OMIT_FRAME_POINTER=y
CONFIG_HYPERVISOR_GUEST=y
-CONFIG_HYPERV_UTILS=m
CONFIG_PARAVIRT=y
CONFIG_PARAVIRT_XXL=y
# CONFIG_PARAVIRT_DEBUG is not set
@@ -864,7 +863,7 @@ CONFIG_BLK_DEV_BSG_COMMON=y
CONFIG_BLK_ICQ=y
CONFIG_BLK_DEV_BSGLIB=y
CONFIG_BLK_DEV_INTEGRITY=y
-CONFIG_BLK_DEV_INTEGRITY_T10=m
+CONFIG_BLK_DEV_INTEGRITY_T10=y
# CONFIG_BLK_DEV_ZONED is not set
CONFIG_BLK_WBT=y
CONFIG_BLK_WBT_MQ=y
@@ -1930,6 +1929,7 @@ CONFIG_DMA_SHARED_BUFFER=y
# end of Cache Drivers
CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
#
# Firmware Drivers
@@ -1983,11 +1983,7 @@ CONFIG_UEFI_CPER_X86=y
# end of Tegra firmware driver
# end of Firmware Drivers
-CONFIG_GNSS=m
-# CONFIG_GNSS_MTK_SERIAL is not set
-# CONFIG_GNSS_SIRF_SERIAL is not set
-# CONFIG_GNSS_UBX_SERIAL is not set
-# CONFIG_GNSS_USB is not set
+# CONFIG_GNSS is not set
# CONFIG_MTD is not set
# CONFIG_OF is not set
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
@@ -2025,11 +2021,11 @@ CONFIG_VIRTIO_BLK=m
#
# NVME Support
#
-CONFIG_NVME_CORE=m
-CONFIG_BLK_DEV_NVME=m
+CONFIG_NVME_CORE=y
+CONFIG_BLK_DEV_NVME=y
CONFIG_NVME_MULTIPATH=y
# CONFIG_NVME_VERBOSE_ERRORS is not set
-CONFIG_NVME_HWMON=m
+CONFIG_NVME_HWMON=y
# CONFIG_NVME_RDMA is not set
# CONFIG_NVME_FC is not set
# CONFIG_NVME_TCP is not set
@@ -3595,6 +3591,7 @@ CONFIG_GPIO_VIPERBOARD=m
# end of Virtual GPIO drivers
CONFIG_W1=m
+CONFIG_W1_CON=y
#
# 1-wire Bus Masters
@@ -4229,6 +4226,7 @@ CONFIG_FB=y
# CONFIG_FB_ASILIANT is not set
# CONFIG_FB_IMSTT is not set
# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_UVESA is not set
CONFIG_FB_VESA=y
CONFIG_FB_EFI=y
# CONFIG_FB_N411 is not set
@@ -5034,6 +5032,7 @@ CONFIG_VHOST_VSOCK=m
CONFIG_HYPERV=m
# CONFIG_HYPERV_VTL_MODE is not set
CONFIG_HYPERV_TIMER=y
+CONFIG_HYPERV_UTILS=m
CONFIG_HYPERV_BALLOON=m
# end of Microsoft Hyper-V guest support
@@ -5771,7 +5770,7 @@ CONFIG_CRYPTO_XXHASH=m
CONFIG_CRYPTO_CRC32C=y
CONFIG_CRYPTO_CRC32=m
CONFIG_CRYPTO_CRCT10DIF=y
-CONFIG_CRYPTO_CRC64_ROCKSOFT=m
+CONFIG_CRYPTO_CRC64_ROCKSOFT=y
# end of CRCs (cyclic redundancy checks)
#
@@ -5947,7 +5946,7 @@ CONFIG_CRYPTO_LIB_SHA256=y
CONFIG_CRC_CCITT=m
CONFIG_CRC16=m
CONFIG_CRC_T10DIF=y
-CONFIG_CRC64_ROCKSOFT=m
+CONFIG_CRC64_ROCKSOFT=y
CONFIG_CRC_ITU_T=m
CONFIG_CRC32=y
# CONFIG_CRC32_SELFTEST is not set
@@ -5955,7 +5954,7 @@ CONFIG_CRC32_SLICEBY8=y
# CONFIG_CRC32_SLICEBY4 is not set
# CONFIG_CRC32_SARWATE is not set
# CONFIG_CRC32_BIT is not set
-CONFIG_CRC64=m
+CONFIG_CRC64=y
# CONFIG_CRC4 is not set
CONFIG_CRC7=m
CONFIG_LIBCRC32C=y