From 446990644bf2e84e8f508855bef2c444b0758083 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Fri, 8 May 2026 22:37:40 +0200 Subject: Kernel: T6847: cleanup comments to not trigger config merge warning --- scripts/package-build/linux-kernel/config/51-bridge.config | 3 +-- scripts/package-build/linux-kernel/config/57-openvpn.config | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/package-build/linux-kernel/config/51-bridge.config b/scripts/package-build/linux-kernel/config/51-bridge.config index 4204ae70..7217df41 100644 --- a/scripts/package-build/linux-kernel/config/51-bridge.config +++ b/scripts/package-build/linux-kernel/config/51-bridge.config @@ -3,8 +3,7 @@ # # Software 802.1D / 802.1Q bridge driver used by VyOS # "interfaces bridge". STP (Spanning Tree Protocol) and LLC -# are auto-selected by net/bridge/Kconfig when CONFIG_BRIDGE -# is enabled, so they don't need to be listed here explicitly. +# are auto-selected by net/bridge/Kconfig # ebtables / bridge-netfilter rules live in 20-netfilter.config. # diff --git a/scripts/package-build/linux-kernel/config/57-openvpn.config b/scripts/package-build/linux-kernel/config/57-openvpn.config index 2de2e7e4..c139b047 100644 --- a/scripts/package-build/linux-kernel/config/57-openvpn.config +++ b/scripts/package-build/linux-kernel/config/57-openvpn.config @@ -3,7 +3,7 @@ # # In-kernel OpenVPN dataplane used by VyOS # "interfaces openvpn" when the kernel offload is available. -# The userspace daemon uses /dev/net/tun (CONFIG_TUN) which +# The userspace daemon uses /dev/net/tun which # stays in the per-arch defconfig. # -- cgit v1.2.3