diff options
| author | dd <dd@wx.tnyzeq.icu> | 2024-07-22 19:00:08 +0200 |
|---|---|---|
| committer | dd <dd@wx.tnyzeq.icu> | 2024-07-22 19:00:08 +0200 |
| commit | dc9295e8759c7ba77ac1b80428f80fa11292ff3f (patch) | |
| tree | 71f36fb0a5f94d3f85f1bf48a4e117d716dede52 | |
| parent | fda443b05001dfb4b6e802c94c0f01032ccd3c17 (diff) | |
| parent | 019054fc172e98476635e19f62d381ee1146850e (diff) | |
| download | vyos-build-dc9295e8759c7ba77ac1b80428f80fa11292ff3f.tar.gz vyos-build-dc9295e8759c7ba77ac1b80428f80fa11292ff3f.zip | |
Merge branch 'vyos:sagitta' into sagitta
| -rw-r--r-- | data/defaults.toml | 2 | ||||
| -rw-r--r-- | packages/linux-kernel/arch/x86/configs/vyos_defconfig | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/data/defaults.toml b/data/defaults.toml index 16f009dd..47619cfc 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.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 |