From: David S. Miller <davem@davemloft.net>
Date: Wed, 6 Aug 2014 01:46:26 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v4.9.8~5959^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d247b6ab3ce6dd43665780865ec5fa145d9ab6bd;p=platform%2Fkernel%2Flinux-rpi3.git

Merge git://git./linux/kernel/git/davem/net

Conflicts:
	drivers/net/Makefile
	net/ipv6/sysctl_net_ipv6.c

Two ipv6_table_template[] additions overlap, so the index
of the ipv6_table[x] assignments needed to be adjusted.

In the drivers/net/Makefile case, we've gotten rid of the
garbage whereby we had to list every single USB networking
driver in the top-level Makefile, there is just one
"USB_NETWORKING" that guards everything.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

d247b6ab3ce6dd43665780865ec5fa145d9ab6bd
diff --cc net/ipv6/sysctl_net_ipv6.c
index 5bf7b61,8183346..0c56c93
--- a/net/ipv6/sysctl_net_ipv6.c
+++ b/net/ipv6/sysctl_net_ipv6.c
@@@ -81,7 -74,7 +81,8 @@@ static int __net_init ipv6_sysctl_net_i
  	ipv6_table[0].data = &net->ipv6.sysctl.bindv6only;
  	ipv6_table[1].data = &net->ipv6.sysctl.anycast_src_echo_reply;
  	ipv6_table[2].data = &net->ipv6.sysctl.flowlabel_consistency;
 -	ipv6_table[3].data = &net->ipv6.sysctl.fwmark_reflect;
 +	ipv6_table[3].data = &net->ipv6.sysctl.auto_flowlabels;
++	ipv6_table[4].data = &net->ipv6.sysctl.fwmark_reflect;
  
  	ipv6_route_table = ipv6_route_sysctl_init(net);
  	if (!ipv6_route_table)