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/ipv4/sysctl_net_ipv4.c between commit
519855c508b9a17878c0977a3cdefc09b59b30df ("TCPCT part 1c:
sysctl_tcp_cookie_size, socket option TCP_COOKIE_TRANSACTIONS") from the
net tree and commit f8572d8f2a2ba75408b97dc24ef47c83671795d7 ("sysctl
net: Remove unused binary sysctl code") from the sysctl tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc net/ipv4/sysctl_net_ipv4.c
index 13f7ab6,3000567..0000000
--- a/net/ipv4/sysctl_net_ipv4.c
+++ b/net/ipv4/sysctl_net_ipv4.c
@@@ -713,15 -569,6 +569,13 @@@ static struct ctl_table ipv4_table[] = 
  		.proc_handler	= proc_dointvec,
  	},
  	{
- 		.ctl_name	= CTL_UNNUMBERED,
 +		.procname	= "tcp_cookie_size",
 +		.data		= &sysctl_tcp_cookie_size,
 +		.maxlen		= sizeof(int),
 +		.mode		= 0644,
 +		.proc_handler	= proc_dointvec
 +	},
 +	{
- 		.ctl_name	= CTL_UNNUMBERED,
  		.procname	= "udp_mem",
  		.data		= &sysctl_udp_mem,
  		.maxlen		= sizeof(sysctl_udp_mem),
--
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/