Hi all,
On Fri, 15 Oct 2021 13:00:22 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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:
pgpvxJWAzKSjL.pgp
Description: OpenPGP digital signature
