Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Tue, 9 Oct 2018 17:18:28 +0200
From:   Pablo Neira Ayuso <pablo@netfilter.org>
To:     Andre Tomt <andre@tomt.net>
Cc:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        linux-kernel@vger.kernel.org, torvalds@linux-foundation.org,
        akpm@linux-foundation.org, linux@roeck-us.net, shuah@kernel.org,
        patches@kernelci.org, ben.hutchings@codethink.co.uk,
        lkft-triage@lists.linaro.org,
        "stable@vger.kernel.org" <stable@vger.kernel.org>
Subject: Re: [PATCH 4.18 000/168] 4.18.13-stable review
Message-ID: <20181009151828.hv6rrxyttjfj3yq7@salvia>
References: <20181008175620.043587728@linuxfoundation.org>
 <966cae81-c3f6-1d38-5721-97dc317a3fde@tomt.net>
 <20181009092154.GC19241@kroah.com>
 <41c3c40f-2757-9405-4899-02eacb3d05f0@tomt.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <41c3c40f-2757-9405-4899-02eacb3d05f0@tomt.net>
User-Agent: NeoMutt/20170113 (1.7.2)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Tue, Oct 09, 2018 at 01:33:39PM +0200, Andre Tomt wrote:
> On 09. okt. 2018 11:21, Greg Kroah-Hartman wrote:
> > On Tue, Oct 09, 2018 at 05:21:31AM +0200, Andre Tomt wrote:
> > > On 08. okt. 2018 20:29, Greg Kroah-Hartman wrote:
> > > > This is the start of the stable review cycle for the 4.18.13 release.
> > > > There are 168 patches in this series, all will be posted as a response
> > > > to this one.  If anyone has any issues with these being applied, please
> > > > let me know.
> > > 
> > >    CC [M]  net/ipv4/netfilter/nf_conntrack_proto_icmp.o
> > > net/ipv4/netfilter/nf_conntrack_proto_icmp.c:373:3: error: ‘const struct
> > > nf_conntrack_l4proto’ has no member named ‘ctnl_timeout’; did you mean
> > > ‘get_timeouts’?
> > >    .ctnl_timeout  = {
> > >     ^~~~~~~~~~~~
> > >     get_timeouts
> > > 
> > > The problematic patch is:> netfilter-conntrack-timeout-interface-depend-on-config_nf_conntrack_timeout.patch
> > > 
> > > The stuff the commit message talks about seems like it was added in
> > > 4.19-rc1, so this should not go into stable.
> > > 
> > > Kernel builds fine with this one patch reverted.
> > 
> > So you have CONFIG_NF_CT_NETLINK_TIMEOUT enabled but not
> > CONFIG_NF_NETLINK_TIMEOUT?  Looks like we just need to modify the .h
> > file to fix this up properly, right?
> 
> Adding Pablo to the thread as I dont know
> 
> > This isn't showing up in my build tests as that configuration seems a
> > bit odd to me.
> 
> I think you meant CONFIG_NF_CONNTRACK_TIMEOUT instead of
> CONFIG_NF_NETLINK_TIMEOUT?
> 
> This is the configuration:
> CONFIG_NF_CONNTRACK_TIMEOUT=y
> # CONFIG_NF_CT_NETLINK_TIMEOUT is not set

upstream commit a874752a10da113f513980e28f562d946d3f829d depends on:

commit 6c1fd7dc489d9bf64196f5b0fa33e059f64460c8
Author: Pablo Neira Ayuso <pablo@netfilter.org>
Date:   Tue Aug 7 17:14:15 2018 +0200

    netfilter: cttimeout: decouple timeout policy from nfnetlink_cttimeout object

So I would suggest to keep it back / not place it 4.18.x stable.

Thanks.