Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	net/ipv4/arp.c

The net/ipv4/arp.c conflict was one commit adding a new
local variable while another commit was deleting one.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/arcnet/arcnet.c
Simple merge

diff --cc drivers/net/dsa/mv88e6xxx.c
Simple merge

diff --cc drivers/net/ethernet/apm/xgene/xgene_enet_hw.c
Simple merge

diff --cc drivers/net/ethernet/broadcom/genet/bcmgenet.c
Simple merge

diff --cc drivers/net/usb/Kconfig
Simple merge

diff --cc drivers/net/vrf.c
Simple merge

diff --cc include/linux/netdevice.h
Simple merge

diff --cc include/net/route.h
Simple merge

diff --cc net/bluetooth/smp.c
Simple merge

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

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

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

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

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

diff --cc net/ipv4/arp.c
index 61ff5ea,f03db8b..01308e6
--- 1/net/ipv4/arp.c
--- 2/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@@ -654,6 -651,8 +657,7 @@@ static int arp_process(struct net *net
        u16 dev_type = dev->type;
        int addr_type;
        struct neighbour *n;
 -      struct net *net = dev_net(dev);
+       struct dst_entry *reply_dst = NULL;
        bool is_garp = false;
  
        /* arp_rcv below verifies the ARP header and verifies the device

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

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

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

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

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

diff --cc net/ipv6/addrconf.c
Simple merge

diff --cc net/ipv6/ip6_output.c
Simple merge

diff --cc net/ipv6/route.c
Simple merge

diff --cc net/openvswitch/conntrack.c
Simple merge

diff --cc net/openvswitch/datapath.c
Simple merge