From fa2c90bdf1a1c6f6ee6b1e54a2f6ae2cee1b41e4 Mon Sep 17 00:00:00 2001 From: Timo Beckers Date: Sat, 1 Nov 2025 15:34:36 +0100 Subject: [PATCH 1/3] Update mainline to 6.19-rc4, stable to 6.18.3, drop 5.4.x Signed-off-by: Timo Beckers --- versions.json | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/versions.json b/versions.json index a66ea36..1f404fe 100644 --- a/versions.json +++ b/versions.json @@ -1,34 +1,30 @@ [ { - "version": "6.16", + "version": "6.19-rc4", "static_tag": "mainline" }, { - "version": "6.15.8", + "version": "6.18.3", "static_tag": "stable" }, { - "version": "6.12.40", + "version": "6.12.63", "static_tag": "longterm" }, { - "version": "6.6.100", + "version": "6.6.119", "static_tag": "" }, { - "version": "6.1.147", + "version": "6.1.159", "static_tag": "" }, { - "version": "5.15.189", + "version": "5.15.197", "static_tag": "" }, { - "version": "5.10.240", - "static_tag": "" - }, - { - "version": "5.4.296", + "version": "5.10.247", "static_tag": "" } ] From 815c73139ad8b006df75ad748b6d7fc85e0a1cff Mon Sep 17 00:00:00 2001 From: Dylan Reimerink Date: Wed, 7 Jan 2026 13:55:28 +0100 Subject: [PATCH 2/3] Fix conflicting types error in selftests Since kernel v6.18-rc3, the selftests have been failing to build due to conflicting types between the generated vmlinux.h and bpf_arena_common.h file in the selftests. The fix for this turns out to be upgrading pahole to 1.30. Signed-off-by: Dylan Reimerink --- Dockerfile | 2 +- Dockerfile.builder | 2 +- VERSION | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 67869d5..5a3a00d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM ghcr.io/cilium/ci-kernels-builder:1762183314 AS configure-vmlinux +FROM --platform=$BUILDPLATFORM ghcr.io/cilium/ci-kernels-builder:1767797740 AS configure-vmlinux ARG KERNEL_VERSION diff --git a/Dockerfile.builder b/Dockerfile.builder index c98eb70..067e784 100644 --- a/Dockerfile.builder +++ b/Dockerfile.builder @@ -17,7 +17,7 @@ COPY llvm.pref /etc/apt/preferences.d # Bake the appropriate clang version into the container ARG CLANG_VERSION=19 -ARG PAHOLE_VERSION=1.27 +ARG PAHOLE_VERSION=1.31 ENV CLANG=clang-${CLANG_VERSION} ENV LLC=llc-${CLANG_VERSION} ENV LLVM_OBJCOPY=llvm-objcopy-${CLANG_VERSION} diff --git a/VERSION b/VERSION index b1bbee9..c3b32c4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1762183314 +1767797740 From e8936497609cde669a021e0941405bb148d7cca2 Mon Sep 17 00:00:00 2001 From: Dylan Reimerink Date: Wed, 7 Jan 2026 15:55:06 +0100 Subject: [PATCH 3/3] Fix selftest compilation for v6.19-rc1 and above In kernel commit beb3c67297d92f9428484410cf79135d38d0aff3 and 86433db9325693561794ac8072732cda1167a1ac selftests were added that rely on types only compiled in under these additional kernel configuration. Signed-off-by: Dylan Reimerink --- config | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config b/config index 29c8e22..82e48a5 100644 --- a/config +++ b/config @@ -46,6 +46,8 @@ CONFIG_DEBUG_KERNEL=y CONFIG_DEBUG_INFO_BTF_MODULES=y # >= 5.18 has a different toggle for debug info CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y +CONFIG_DIBS=y +CONFIG_DIBS_LO=y CONFIG_DYNAMIC_FTRACE=y CONFIG_EPOLL=y CONFIG_EVENTFD=y @@ -57,6 +59,7 @@ CONFIG_HW_RANDOM=y CONFIG_IKCONFIG_PROC=y CONFIG_IKCONFIG=y CONFIG_INET=y +CONFIG_INFINIBAND=y CONFIG_IPV6=y CONFIG_KPROBES=y CONFIG_LIRC=y @@ -81,9 +84,12 @@ CONFIG_RC_CORE=y CONFIG_RC_DECODERS=y CONFIG_SECURITY=y CONFIG_SECURITYFS=y +CONFIG_SMC=y +CONFIG_SMC_HS_CTRL_BPF=y CONFIG_STACK_TRACER=y CONFIG_UPROBE_EVENT=y CONFIG_UPROBE_EVENTS=y +CONFIG_VXLAN=y CONFIG_XDP_SOCKETS=y # VirtIO