Skip to content

Commit a45cf3f

Browse files
authored
Merge pull request #1109 from c-po/kernel-6.6.121
Kernel: T8203: Update Linux Kernel to 6.6.121
2 parents 32552c9 + 5c72cae commit a45cf3f

4 files changed

Lines changed: 48 additions & 6 deletions

File tree

data/defaults.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ vyos_mirror = "https://packages.vyos.net/repositories/current"
1414
vyos_branch = "current"
1515
release_train = "current"
1616

17-
kernel_version = "6.6.117"
17+
kernel_version = "6.6.121"
1818
kernel_flavor = "vyos"
1919
bootloaders = "syslinux,grub-efi"
2020

scripts/package-build/linux-kernel/package.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ build_cmd = "build_kernel"
1212

1313
[[packages]]
1414
name = "linux-firmware"
15-
commit_id = "20240610"
15+
commit_id = "20260110"
1616
scm_url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"
1717
build_cmd = "build_linux_firmware"
1818

@@ -110,8 +110,10 @@ packages = [
110110
"ruby-dev",
111111
"rubygems",
112112
"build-essential",
113+
"binutils-dev",
113114
"libdw-dev",
114115
"libunwind-dev",
116+
"libdebuginfod-dev",
115117
"systemtap-sdt-dev",
116118
"libslang2-dev",
117119
"python-dev-is-python3",

scripts/package-build/linux-kernel/patches/kernel/0001-linkstate-ip-device-attribute.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,18 +101,18 @@ index 798497c8b192..0b4510b06ab5 100644
101101
};
102102

103103
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c
104-
index 0e49ee83533b..227e9e439fea 100644
104+
index 2737bb4751e4..dcf32b532598 100644
105105
--- a/net/ipv6/addrconf.c
106106
+++ b/net/ipv6/addrconf.c
107-
@@ -5671,6 +5671,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf,
107+
@@ -5699,6 +5699,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf,
108108
array[DEVCONF_NDISC_EVICT_NOCARRIER] = cnf->ndisc_evict_nocarrier;
109109
array[DEVCONF_ACCEPT_UNTRACKED_NA] = cnf->accept_untracked_na;
110110
array[DEVCONF_ACCEPT_RA_MIN_LFT] = cnf->accept_ra_min_lft;
111111
+ array[DEVCONF_LINK_FILTER] = cnf->link_filter;
112112
}
113113

114114
static inline size_t inet6_ifla6_size(void)
115-
@@ -7115,6 +7116,13 @@ static const struct ctl_table addrconf_sysctl[] = {
115+
@@ -7143,6 +7144,13 @@ static const struct ctl_table addrconf_sysctl[] = {
116116
.extra1 = (void *)SYSCTL_ZERO,
117117
.extra2 = (void *)SYSCTL_ONE,
118118
},
@@ -127,7 +127,7 @@ index 0e49ee83533b..227e9e439fea 100644
127127
.procname = "ioam6_id",
128128
.data = &ipv6_devconf.ioam6_id,
129129
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
130-
index eb9e505f71f9..bdcbaf43bf6d 100644
130+
index ad452a04d729..b45e5e0fe8c4 100644
131131
--- a/net/ipv6/route.c
132132
+++ b/net/ipv6/route.c
133133
@@ -716,6 +716,14 @@ static inline void rt6_probe(struct fib6_nh *fib6_nh)
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
From c660a5ee919f01e7c3269ea92baf13741c8aee17 Mon Sep 17 00:00:00 2001
2+
From: Christian Breunig <christian@breunig.cc>
3+
Date: Sat, 24 Jan 2026 07:06:05 +0100
4+
Subject: [PATCH] tools: fix implicit declaration of function cpu_to_le16
5+
6+
After commit 64d86c03e1441742216b6332bdfabfb6ede31662 ("perf arm-spe: Extend
7+
branch operations") which was also backported to the stable branches, the
8+
restructuring caused a missing definition.
9+
10+
tools/include/linux/bitops.h implement
11+
12+
define __MAKE_OP(size) \
13+
____MAKE_OP(le##size,u##size,cpu_to_le##size,le##size##_to_cpu) \
14+
____MAKE_OP(be##size,u##size,cpu_to_be##size,be##size##_to_cpu) \
15+
____MAKE_OP(u##size,u##size,,)
16+
____MAKE_OP(u8,u8,,)
17+
18+
but cpu_to_le## or cpu_to_be## are not defined.
19+
20+
Fix by including linux/kernel.h.
21+
22+
---
23+
tools/include/linux/bitfield.h | 1 +
24+
1 file changed, 1 insertion(+)
25+
26+
diff --git a/tools/include/linux/bitfield.h b/tools/include/linux/bitfield.h
27+
index 6093fa6db260..ddf81f24956b 100644
28+
--- a/tools/include/linux/bitfield.h
29+
+++ b/tools/include/linux/bitfield.h
30+
@@ -8,6 +8,7 @@
31+
#define _LINUX_BITFIELD_H
32+
33+
#include <linux/build_bug.h>
34+
+#include <linux/kernel.h>
35+
#include <asm/byteorder.h>
36+
37+
/*
38+
--
39+
2.39.5
40+

0 commit comments

Comments
 (0)