commit 45746b23a25fa0f5e0e88baa0ce3f8c20de70b4e
author Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 21 17:38:24 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 21 17:38:24 2025 -0800
tree 600a25e71df331024a2c94e353e6c8db0f91c500
parent ff355c809e0d9be5dd1d74325d368703c7a7d8a8
parent 08ad359e27e5530537c83e39304f5702e4f6f642

Merge "merge-upstream/v6.6.72 from branch/tag: upstream/v6.6.72 into branch: cos-6.6" into cos-6.6

arch/arm64/configs/lakitu_defconfig

diff --git a/arch/arm64/configs/lakitu_defconfig b/arch/arm64/configs/lakitu_defconfig
index 8002702..3d4320d 100644
--- a/arch/arm64/configs/lakitu_defconfig
+++ b/arch/arm64/configs/lakitu_defconfig
@@ -1232,7 +1232,7 @@
 # CONFIG_NF_TABLES_NETDEV is not set
 CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
-# CONFIG_NFT_FLOW_OFFLOAD is not set
+CONFIG_NFT_FLOW_OFFLOAD=m
 CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
@@ -1253,9 +1253,9 @@
 CONFIG_NFT_OSF=m
 CONFIG_NFT_TPROXY=m
 CONFIG_NFT_SYNPROXY=m
-# CONFIG_NF_FLOW_TABLE_INET is not set
+CONFIG_NF_FLOW_TABLE_INET=m
 CONFIG_NF_FLOW_TABLE=m
-# CONFIG_NF_FLOW_TABLE_PROCFS is not set
+CONFIG_NF_FLOW_TABLE_PROCFS=y
 CONFIG_NETFILTER_XTABLES=y
 CONFIG_NETFILTER_XTABLES_COMPAT=y
 

arch/x86/configs/lakitu_defconfig

diff --git a/arch/x86/configs/lakitu_defconfig b/arch/x86/configs/lakitu_defconfig
index 7d3085f..882b633 100644
--- a/arch/x86/configs/lakitu_defconfig
+++ b/arch/x86/configs/lakitu_defconfig
@@ -1296,7 +1296,7 @@
 # CONFIG_NF_TABLES_NETDEV is not set
 CONFIG_NFT_NUMGEN=m
 CONFIG_NFT_CT=m
-# CONFIG_NFT_FLOW_OFFLOAD is not set
+CONFIG_NFT_FLOW_OFFLOAD=m
 CONFIG_NFT_CONNLIMIT=m
 CONFIG_NFT_LOG=m
 CONFIG_NFT_LIMIT=m
@@ -1317,9 +1317,9 @@
 CONFIG_NFT_OSF=m
 CONFIG_NFT_TPROXY=m
 CONFIG_NFT_SYNPROXY=m
-# CONFIG_NF_FLOW_TABLE_INET is not set
+CONFIG_NF_FLOW_TABLE_INET=m
 CONFIG_NF_FLOW_TABLE=m
-# CONFIG_NF_FLOW_TABLE_PROCFS is not set
+CONFIG_NF_FLOW_TABLE_PROCFS=y
 CONFIG_NETFILTER_XTABLES=y
 CONFIG_NETFILTER_XTABLES_COMPAT=y