[SRU][J:linux-bluefield][PATCH v2] UBUNTU: [Config] bluefield: Enable CONFIG_NF_CONNTRACK as build-in

[Bodong Wang]

BugLink: https://bugs.launchpad.net/bugs/2017600

CONFIG_NF_DEFRAG_IPV4 and CONFIG_NF_DEFRAG_IPV6 are selected as
build-in along with CONFIG_NF_CONNTRACK.

Also configure the annotations accordingly.

Signed-off-by: Bodong Wang <bodong at nvidia.com>
---
 debian.bluefield/config/config.common.ubuntu | 6 +++---
 debian.master/config/annotations             | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian.bluefield/config/config.common.ubuntu b/debian.bluefield/config/config.common.ubuntu
index f5f7959cdf74..04a83149cd7b 100644
--- a/debian.bluefield/config/config.common.ubuntu
+++ b/debian.bluefield/config/config.common.ubuntu
@@ -6138,7 +6138,7 @@ CONFIG_NFT_SYNPROXY=m
 CONFIG_NFT_TPROXY=m
 CONFIG_NFT_TUNNEL=m
 CONFIG_NFT_XFRM=m
-CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK=y
 CONFIG_NF_CONNTRACK_AMANDA=m
 CONFIG_NF_CONNTRACK_BRIDGE=m
 CONFIG_NF_CONNTRACK_BROADCAST=m
@@ -6166,8 +6166,8 @@ CONFIG_NF_CT_PROTO_DCCP=y
 CONFIG_NF_CT_PROTO_GRE=y
 CONFIG_NF_CT_PROTO_SCTP=y
 CONFIG_NF_CT_PROTO_UDPLITE=y
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_DEFRAG_IPV4=y
+CONFIG_NF_DEFRAG_IPV6=y
 CONFIG_NF_DUP_IPV4=m
 CONFIG_NF_DUP_IPV6=m
 CONFIG_NF_DUP_NETDEV=m
diff --git a/debian.master/config/annotations b/debian.master/config/annotations
index a531e19a9288..86cb364be248 100644
--- a/debian.master/config/annotations
+++ b/debian.master/config/annotations
@@ -12674,7 +12674,7 @@ CONFIG_NETFILTER_XT_MATCH_TIME                  policy<{'amd64': 'm', 'arm64': '
 CONFIG_NETFILTER_XT_MATCH_U32                   policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 
 # Menu: Networking support >> Networking options >> Network packet filtering framework (Netfilter) >> Core Netfilter Configuration >> Netfilter connection tracking support
-CONFIG_NF_CONNTRACK                             policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
+CONFIG_NF_CONNTRACK                             policy<{'amd64': 'm', 'arm64': 'y', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 CONFIG_NF_CONNTRACK_MARK                        policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_NF_CONNTRACK_SECMARK                     policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
 CONFIG_NF_CONNTRACK_ZONES                       policy<{'amd64': 'y', 'arm64': 'y', 'armhf': 'y', 'ppc64el': 'y', 's390x': 'y'}>
@@ -12703,6 +12703,7 @@ CONFIG_NETFILTER_NETLINK_GLUE_CT                policy<{'amd64': 'y', 'arm64': '
 CONFIG_NF_NAT                                   policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
 #
 CONFIG_NF_CONNTRACK_PROCFS                      flag<DEPRECATED>
+CONFIG_NF_CONNTRACK                             note<LP: #2017600>
 
 # Menu: Networking support >> Networking options >> Network packet filtering framework (Netfilter) >> Core Netfilter Configuration >> Netfilter nf_tables support
 CONFIG_NF_TABLES                                policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
-- 
2.27.0