Merge git://git.kernel.org/pub/scm/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>

diff --cc drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
Simple merge

diff --cc net/bridge/br_fdb.c
Simple merge

diff --cc net/core/skbuff.c
Simple merge

diff --cc net/ipv4/ip_tunnel.c
Simple merge

diff --cc net/ipv6/sysctl_net_ipv6.c
index 5bf7b61f8ae8bc9403b9ea8b705f73d09eaccac5,818334619abbb41a06da2c690e235de43f617ca2..0c56c93619e063710a8d32f3f9e15fd9cdb6453c
--- 1/net/ipv6/sysctl_net_ipv6.c
--- 2/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)

diff --cc net/netfilter/nf_tables_api.c
Simple merge

diff --cc net/netfilter/xt_LED.c
Simple merge

diff --cc net/sctp/output.c
Simple merge