ACK/Cmnt: [SRU][J:linux-bluefield][PATCH v3] UBUNTU: [Config] bluefield: Enable CONFIG_NF_CONNTRACK as build-in

[Tim Gardner]

On 5/2/23 23:08, Bodong Wang wrote:
> 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/annotations          | 3 +++
>   debian.bluefield/config/config.common.ubuntu | 6 +++---
>   2 files changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/debian.bluefield/config/annotations b/debian.bluefield/config/annotations
> index 401a68cb3bc1..d5835cad4b66 100644
> --- a/debian.bluefield/config/annotations
> +++ b/debian.bluefield/config/annotations
> @@ -3,3 +3,6 @@
>   # ARCH: arm64
>   
>   include "../../debian.master/config/annotations"
> +
> +CONFIG_NF_CONNTRACK                             policy<{'amd64': 'm', 'arm64': 'y', 'armhf': 'm', 'ppc64el': 'm', 's390x': 'm'}>
> +CONFIG_NF_CONNTRACK                             note<LP: #2017600>
> 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
Acked-by: Tim Gardner <tim.gardner at canonical.com>

Remember to describe your changes from one patch version to the next.
-- 
-----------
Tim Gardner
Canonical, Inc