summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-07-17 15:07:26 +0200
committerGitHub <noreply@github.com>2024-07-17 15:07:26 +0200
commit31684479b205ca0970070a480b576dfca8e9406a (patch)
tree6c5e523ba85d48b877850109df1da057e3a5823f
parentb7b0a582ec38e69dbcd411576eebcf11d2cbf0f2 (diff)
parentfaf191ed858373fab0f4add7edadd40e64f11f2e (diff)
downloadvyos-build-31684479b205ca0970070a480b576dfca8e9406a.tar.gz
vyos-build-31684479b205ca0970070a480b576dfca8e9406a.zip
Merge pull request #699 from c-po/kernel-changes
Kernel changes
-rw-r--r--data/defaults.toml2
-rw-r--r--packages/linux-kernel/arch/x86/configs/vyos_defconfig6
2 files changed, 4 insertions, 4 deletions
diff --git a/data/defaults.toml b/data/defaults.toml
index e6eeb31f..12701194 100644
--- a/data/defaults.toml
+++ b/data/defaults.toml
@@ -14,7 +14,7 @@ vyos_mirror = "https://rolling-packages.vyos.net/current"
vyos_branch = "current"
release_train = "current"
-kernel_version = "6.6.39"
+kernel_version = "6.6.40"
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 fbf0c88d..767058a8 100644
--- a/packages/linux-kernel/arch/x86/configs/vyos_defconfig
+++ b/packages/linux-kernel/arch/x86/configs/vyos_defconfig
@@ -2987,9 +2987,9 @@ CONFIG_MT7663_USB_SDIO_COMMON=m
CONFIG_MT7663U=m
CONFIG_MT7663S=m
CONFIG_MT7915E=m
-CONFIG_MT7921E=m
-CONFIG_MT7921S=m
-CONFIG_MT7921U=m
+# CONFIG_MT7921E is not set
+# CONFIG_MT7921S is not set
+# CONFIG_MT7921U is not set
# CONFIG_MT7996E is not set
CONFIG_WLAN_VENDOR_MICROCHIP=y
# CONFIG_WILC1000_SDIO is not set