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

[Stephen Rothwell]

Hi Eric,

Today's linux-next merge of the sysctl tree got a conflict in
net/ipv6/addrconf.c between commit
f7734fdf61ec6bb848e0bafc1fb8bad2c124bb50 ("make TLLAO option for NA
packets configurable") from the net tree and commit
f8572d8f2a2ba75408b97dc24ef47c83671795d7 ("sysctl net: Remove unused
binary sysctl code") from the sysctl tree.

I fixed it up (see below) including removing the new ctl_name (thanks for
the heads up, Eric).   I can carry this fixup as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc net/ipv6/addrconf.c
index 522bdc7,f918399..0000000
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
@@@ -4388,15 -4285,7 +4320,14 @@@ static struct addrconf_sysctl_tabl
  			.proc_handler	=	proc_dointvec,
  		},
  		{
- 			.ctl_name       = CTL_UNNUMBERED,
 +			.procname       = "force_tllao",
 +			.data           = &ipv6_devconf.force_tllao,
 +			.maxlen         = sizeof(int),
 +			.mode           = 0644,
 +			.proc_handler   = proc_dointvec
 +		},
 +		{
- 			.ctl_name	=	0,	/* sentinel */
+ 			/* sentinel */
  		}
  	},
  };
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/