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

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

diff --cc drivers/net/ethernet/realtek/r8169.c
Simple merge

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

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

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

diff --cc include/net/net_namespace.h
index f8a84a2,0490084..f306b2a
--- 1/include/net/net_namespace.h
--- 2/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@@ -223,6 -223,11 +223,11 @@@ int net_eq(const struct net *net1, cons
        return net1 == net2;
  }
  
 -      return atomic_read(&net->count) != 0;
+ static inline int check_net(const struct net *net)
+ {
++      return refcount_read(&net->count) != 0;
+ }
+ 
  void net_drop_ns(void *);
  
  #else

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

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

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

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

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