From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Miller <davem@davemloft•net>, Networking <netdev@vger•kernel.org>
Cc: Pablo Neira Ayuso <pablo@netfilter•org>,
NetFilter <netfilter-devel@vger•kernel.org>,
Antoine Tenart <atenart@kernel•org>,
Dust Li <dust.li@linux•alibaba.com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the netfilter-next tree with the netfilter tree
Date: Tue, 19 Oct 2021 10:13:30 +1100 [thread overview]
Message-ID: <20211019101330.59790f64@canb.auug.org.au> (raw)
In-Reply-To: <20211015130022.51468c6d@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1782 bytes --]
Hi all,
On Fri, 15 Oct 2021 13:00:22 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the netfilter-next tree got a conflict in:
>
> net/netfilter/ipvs/ip_vs_ctl.c
>
> between commit:
>
> 174c37627894 ("netfilter: ipvs: make global sysctl readonly in non-init netns")
>
> from the netfilter tree and commit:
>
> 2232642ec3fb ("ipvs: add sysctl_run_estimation to support disable estimation")
>
> from the netfilter-next tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> diff --cc net/netfilter/ipvs/ip_vs_ctl.c
> index 29ec3ef63edc,cbea5a68afb5..000000000000
> --- a/net/netfilter/ipvs/ip_vs_ctl.c
> +++ b/net/netfilter/ipvs/ip_vs_ctl.c
> @@@ -4090,11 -4096,8 +4096,13 @@@ static int __net_init ip_vs_control_net
> tbl[idx++].data = &ipvs->sysctl_conn_reuse_mode;
> tbl[idx++].data = &ipvs->sysctl_schedule_icmp;
> tbl[idx++].data = &ipvs->sysctl_ignore_tunneled;
> + ipvs->sysctl_run_estimation = 1;
> + tbl[idx++].data = &ipvs->sysctl_run_estimation;
> +#ifdef CONFIG_IP_VS_DEBUG
> + /* Global sysctls must be ro in non-init netns */
> + if (!net_eq(net, &init_net))
> + tbl[idx++].mode = 0444;
> +#endif
>
> ipvs->sysctl_hdr = register_net_sysctl(net, "net/ipv4/vs", tbl);
> if (ipvs->sysctl_hdr == NULL) {
This is now a conflict between the net-next tree and the netfilter tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-10-18 23:13 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-15 2:00 linux-next: manual merge of the netfilter-next tree with the netfilter tree Stephen Rothwell
2021-10-18 23:13 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-04-15 1:22 Stephen Rothwell
2019-04-16 1:26 ` Stephen Rothwell
2018-05-24 16:19 Mark Brown
2017-12-07 1:58 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211019101330.59790f64@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=atenart@kernel$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=dust.li@linux$(echo .)alibaba.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=netfilter-devel@vger$(echo .)kernel.org \
--cc=pablo@netfilter$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox