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

[Andrei Gherzan]

On 23/04/27 12:55PM, Bodong Wang wrote:
> 
> 
> On 4/26/2023 8:38 AM, Bodong Wang wrote:
> > 
> > 
> > On 4/26/2023 4:02 AM, Andrei Gherzan wrote:
> > > On 23/04/25 10:21PM, 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/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
> > > 
> > > This should have been in debian.bluefield/config/annotations as this is
> > > logically "attached" to the debian.bluefield config above.
> > > 
> > debian.bluefield/config/annotations is basically empty and include
> > "../../debian.master/config/annotations", no other changes.

I see what you mean.

> > 
> > I'm wondering how this was done before? Or this is the first time Nvidia
> > is changing the annotations.
> > 
> > Regardless, do you expect to move all the above changes to the
> > debian.bluefield file or only the Note?

I would move all your annotations changes to this file. That includes
both the policy and the note while keeping the actual configs where they
currently are in your patch:

debian.bluefield/config/config.common.ubuntu

This is because you want an annotation policy for the configs you
provide as part of `debian.bluefield` - both as policy and associated
note.

Regards,
-- 
Andrei Gherzan
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20230428/df110438/attachment.sig>