Kernel: T5887: update Linux Kernel to v6.6.54

(cherry picked from commit 1e53e64) # Conflicts: # data/defaults.toml
vyos · Oct 5, 2024 · 2c4af6c · 2c4af6c
1 parent 84423ea
commit 2c4af6c
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/data/defaults.toml b/data/defaults.toml
@@ -14,7 +14,12 @@ vyos_mirror = "http://dev.packages.vyos.net/repositories/sagitta"
 vyos_branch = "sagitta"
 release_train = "sagitta"
 
+<<<<<<< HEAD
 kernel_version = "6.6.49"
+=======
+kernel_version = "6.6.54"
+kernel_flavor = "vyos"
+>>>>>>> 1e53e645 (Kernel: T5887: update Linux Kernel to v6.6.54)
 bootloaders = "syslinux,grub-efi"
 
 squashfs_compression_type = "xz -Xbcj x86 -b 256k -always-use-fragments -no-recovery"