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

From: Stephen Rothwell
Date: Fri Jun 07 2019 - 01:49:16 EST

Hi all,

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


between commit:

323a53c41292 ("ipv6: tcp: enable flowlabel reflection in some RST packets")

from the net-next tree and commit:

f4e7c821eda5 ("proc/sysctl: add shared variables for range check")

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

Stephen Rothwell

diff --cc net/ipv6/sysctl_net_ipv6.c
index 6d86fac472e7,4c6adfccc3d2..000000000000
--- a/net/ipv6/sysctl_net_ipv6.c
+++ b/net/ipv6/sysctl_net_ipv6.c
@@@ -21,9 -21,6 +21,7 @@@
#include <net/calipso.h>

- static int zero;
- static int one = 1;
+static int three = 3;
static int auto_flowlabels_min;
static int auto_flowlabels_max = IP6_AUTO_FLOW_LABEL_MAX;

@@@ -115,8 -112,6 +113,8 @@@ static struct ctl_table ipv6_table_temp
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec,
- .extra1 = &zero,
++ .extra1 = SYSCTL_ZERO,
+ .extra2 = &three,
.procname = "max_dst_opts_number",

Attachment: pgpddoYHjSJ9y.pgp
Description: OpenPGP digital signature