summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/hsflowd/Jenkinsfile2
-rw-r--r--packages/linux-kernel/arch/arm64/configs/vyos_defconfig2
-rw-r--r--packages/linux-kernel/arch/x86/configs/vyos_defconfig2
3 files changed, 3 insertions, 3 deletions
diff --git a/packages/hsflowd/Jenkinsfile b/packages/hsflowd/Jenkinsfile
index 775d0ac7..a0e4ecd9 100644
--- a/packages/hsflowd/Jenkinsfile
+++ b/packages/hsflowd/Jenkinsfile
@@ -23,7 +23,7 @@
// and not via a DEB package
def pkgList = [
['name': 'host-sflow',
- 'scmCommit': 'v2.0.50-4',
+ 'scmCommit': 'v2.0.52-1',
'scmUrl': 'https://github.com/sflow/host-sflow.git',
'buildCmd': 'cd ..; ./build.sh'],
]
diff --git a/packages/linux-kernel/arch/arm64/configs/vyos_defconfig b/packages/linux-kernel/arch/arm64/configs/vyos_defconfig
index ab53a174..8537751b 100644
--- a/packages/linux-kernel/arch/arm64/configs/vyos_defconfig
+++ b/packages/linux-kernel/arch/arm64/configs/vyos_defconfig
@@ -1322,7 +1322,7 @@ CONFIG_NF_TABLES_BRIDGE=m
# CONFIG_NFT_BRIDGE_META is not set
CONFIG_NFT_BRIDGE_REJECT=m
CONFIG_NF_LOG_BRIDGE=m
-# CONFIG_NF_CONNTRACK_BRIDGE is not set
+CONFIG_NF_CONNTRACK_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m
diff --git a/packages/linux-kernel/arch/x86/configs/vyos_defconfig b/packages/linux-kernel/arch/x86/configs/vyos_defconfig
index a779c30c..41454024 100644
--- a/packages/linux-kernel/arch/x86/configs/vyos_defconfig
+++ b/packages/linux-kernel/arch/x86/configs/vyos_defconfig
@@ -1475,7 +1475,7 @@ CONFIG_NF_DEFRAG_IPV6=m
CONFIG_NF_TABLES_BRIDGE=m
# CONFIG_NFT_BRIDGE_META is not set
CONFIG_NFT_BRIDGE_REJECT=m
-# CONFIG_NF_CONNTRACK_BRIDGE is not set
+CONFIG_NF_CONNTRACK_BRIDGE=m
CONFIG_BRIDGE_NF_EBTABLES=m
CONFIG_BRIDGE_EBT_BROUTE=m
CONFIG_BRIDGE_EBT_T_FILTER=m