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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/cavium/thunder/nicvf_main.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_common.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
Simple merge

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

diff --cc kernel/bpf/verifier.c
Simple merge

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

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

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

diff --cc net/ipv6/route.c
index 3d7d4e09301ef4deae1985412599c6f4e973c46f,a96d5b385d8fa25bab416d3f6bc836e743b3ca99..13b0d6d1cc303cab6d86b3e11fde73f7cba08fd8
--- 1/net/ipv6/route.c
--- 2/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@@ -1877,10 -1325,9 +1877,10 @@@ struct dst_entry *ip6_blackhole_route(s
        struct dst_entry *new = NULL;
  
        rt = dst_alloc(&ip6_dst_blackhole_ops, loopback_dev, 1,
-                      DST_OBSOLETE_NONE, 0);
+                      DST_OBSOLETE_DEAD, 0);
        if (rt) {
                rt6_info_init(rt);
 +              atomic_inc(&net->ipv6.rt6_stats->fib_rt_alloc);
  
                new = &rt->dst;
                new->__use = 1;