linux-kernel - linux-next: manual merge of the akpm tree with the net tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20190626220242.26fc2d3e@canb.auug.org.au>
Date:   Wed, 26 Jun 2019 22:02:42 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        David Miller <davem@...emloft.net>,
        Networking <netdev@...r.kernel.org>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Eiichi Tsukata <devel@...ukata.com>,
        Matteo Croce <mcroce@...hat.com>
Subject: linux-next: manual merge of the akpm tree with the net tree

Hi all,

Today's linux-next merge of the akpm tree got a conflict in:

  net/ipv6/route.c

between commit:

  b8e8a86337c2 ("net/ipv6: Fix misuse of proc_dointvec "skip_notify_on_dev_down"")

from the net tree and patch:

  "proc/sysctl: add shared variables for range check"

from the akpm 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.

-- 
Cheers,
Stephen Rothwell

diff --cc net/ipv6/route.c
index a0994415484e,c5125cdff32c..000000000000
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@@ -6077,9 -6074,9 +6074,9 @@@ static struct ctl_table ipv6_route_tabl
  		.data		=	&init_net.ipv6.sysctl.skip_notify_on_dev_down,
  		.maxlen		=	sizeof(int),
  		.mode		=	0644,
 -		.proc_handler	=	proc_dointvec,
 +		.proc_handler	=	proc_dointvec_minmax,
- 		.extra1		=	&zero,
- 		.extra2		=	&one,
+ 		.extra1		=	SYSCTL_ZERO,
+ 		.extra2		=	SYSCTL_ONE,
  	},
  	{ }
  };

Content of type "application/pgp-signature" skipped