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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx4/main.c
Simple merge

diff --cc drivers/net/ethernet/netronome/nfp/nfp_net_common.c
Simple merge

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

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

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

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

diff --cc kernel/events/core.c
Simple merge

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

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

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

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

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

diff --cc net/ipv6/ip6_fib.c
index 8c58c7558de003bb47e9c50c7f4fcfc0b7251bd5,5cc0ea0381981b0539d5d6e67401d962a6f6a230..549aacc3cb2c6f803a19d97e295ceac56ce6ef44
--- 1/net/ipv6/ip6_fib.c
--- 2/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@@ -1011,8 -913,9 +1011,10 @@@ add
                        fn->fn_flags |= RTN_RTINFO;
                }
                nsiblings = iter->rt6i_nsiblings;
 +              iter->rt6i_node = NULL;
                fib6_purge_rt(iter, fn, info->nl_net);
+               if (fn->rr_ptr == iter)
+                       fn->rr_ptr = NULL;
                rt6_release(iter);
  
                if (nsiblings) {
@@@ -1024,8 -927,9 +1026,10 @@@
                                        break;
                                if (rt6_qualify_for_ecmp(iter)) {
                                        *ins = iter->dst.rt6_next;
 +                                      iter->rt6i_node = NULL;
                                        fib6_purge_rt(iter, fn, info->nl_net);
+                                       if (fn->rr_ptr == iter)
+                                               fn->rr_ptr = NULL;
                                        rt6_release(iter);
                                        nsiblings--;
                                } else {

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

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

diff --cc net/sched/cls_api.c
Simple merge

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

diff --cc net/unix/af_unix.c
Simple merge

diff --cc tools/lib/bpf/libbpf.c
Simple merge