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

[Stephen Rothwell]

Hi all,

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

  net/ipv6/sysctl_net_ipv6.c

between commit:

  00dc3307c0f7 ("net/ipv6: Fix misuse of proc_dointvec "flowlabel_reflect"")

from the net-next tree and patch:

  "proc-sysctl-add-shared-variables-for-range-check-fix-2-fix"

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/sysctl_net_ipv6.c
index 57f520d1bf45,e00cf070e542..000000000000
--- a/net/ipv6/sysctl_net_ipv6.c
+++ b/net/ipv6/sysctl_net_ipv6.c
@@@ -112,8 -112,8 +112,8 @@@ static struct ctl_table ipv6_table_temp
  		.data		= &init_net.ipv6.sysctl.flowlabel_reflect,
  		.maxlen		= sizeof(int),
  		.mode		= 0644,
 -		.proc_handler	= proc_dointvec,
 +		.proc_handler	= proc_dointvec_minmax,
- 		.extra1		= &zero,
+ 		.extra1		= SYSCTL_ZERO,
  		.extra2		= &flowlabel_reflect_max,
  	},
  	{

Attachment: pgpBoaoLq_Zpu.pgp
Description: OpenPGP digital signature