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

Three cases of simple overlapping changes.

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

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

diff --cc drivers/net/dsa/bcm_sf2.h
Simple merge

diff --cc drivers/net/ethernet/aquantia/atlantic/aq_ring.c
Simple merge

diff --cc drivers/net/ethernet/aquantia/atlantic/aq_vec.c
Simple merge

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

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

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

diff --cc drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
Simple merge

diff --cc drivers/net/ethernet/faraday/ftgmac100.c
Simple merge

diff --cc drivers/net/ethernet/freescale/fman/mac.c
Simple merge

diff --cc drivers/net/ethernet/marvell/mvpp2.c
index f37c05fed5bcf3c601ef64c912c9f58051fd7686,4d598ca8503a50952576354ae35f1b3b6a574b6e..d5624894152e1e6317b50092cdda223837e0ad0f
--- 1/drivers/net/ethernet/marvell/mvpp2.c
--- 2/drivers/net/ethernet/marvell/mvpp2.c
+++ b/drivers/net/ethernet/marvell/mvpp2.c
@@@ -7478,9 -6504,7 +7478,9 @@@ static int mvpp2_port_probe(struct plat
        struct resource *res;
        const char *dt_mac_addr;
        const char *mac_from;
-       char hw_mac_addr[ETH_ALEN];
+       char hw_mac_addr[ETH_ALEN] = {0};
 +      unsigned int ntxqs, nrxqs;
 +      bool has_tx_irqs;
        u32 id;
        int features;
        int phy_mode;

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en.h
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_rx.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_tc.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c
Simple merge

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

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

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

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

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

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

diff --cc drivers/net/ethernet/qlogic/qlge/qlge_dbg.c
Simple merge

diff --cc drivers/net/hyperv/netvsc_drv.c
Simple merge

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

diff --cc drivers/net/phy/phy_device.c
Simple merge

diff --cc drivers/net/usb/cdc_ncm.c
Simple merge

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

diff --cc drivers/net/wireless/intel/iwlwifi/pcie/internal.h
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/pcie/rx.c
Simple merge

diff --cc drivers/net/wireless/intel/iwlwifi/pcie/trans.c
Simple merge

diff --cc include/linux/mlx5/driver.h
Simple merge

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

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

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

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

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

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

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

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

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

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

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

diff --cc net/dsa/dsa2.c
Simple merge

diff --cc net/dsa/tag_ksz.c
Simple merge

diff --cc net/dsa/tag_trailer.c
Simple merge

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

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

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

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

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

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

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

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

diff --cc net/ipv6/ip6_fib.c
index 549aacc3cb2c6f803a19d97e295ceac56ce6ef44,e1c85bb4eac0fd50905fc441e726eca843fc36a8..a3b5c163325fa3448818c446c7de502eb4f5a9c8
--- 1/net/ipv6/ip6_fib.c
--- 2/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@@ -154,7 -160,12 +161,12 @@@ static void node_free_rcu(struct rcu_he
        kmem_cache_free(fib6_node_kmem, fn);
  }
  
 -static void rt6_free_pcpu(struct rt6_info *non_pcpu_rt)
+ static void node_free(struct fib6_node *fn)
+ {
+       call_rcu(&fn->rcu, node_free_rcu);
+ }
+ 
 +void rt6_free_pcpu(struct rt6_info *non_pcpu_rt)
  {
        int cpu;
  
@@@ -971,10 -889,8 +983,10 @@@ add
  
                rt->dst.rt6_next = iter;
                *ins = rt;
-               rt->rt6i_node = fn;
+               rcu_assign_pointer(rt->rt6i_node, fn);
                atomic_inc(&rt->rt6i_ref);
 +              call_fib6_entry_notifiers(info->nl_net, FIB_EVENT_ENTRY_ADD,
 +                                        rt);
                if (!info->skip_notify)
                        inet6_rt_notify(RTM_NEWROUTE, rt, info, nlflags);
                info->nl_net->ipv6.rt6_stats->fib_rt_entries++;
@@@ -999,11 -915,9 +1011,11 @@@
                        return err;
  
                *ins = rt;
-               rt->rt6i_node = fn;
+               rcu_assign_pointer(rt->rt6i_node, fn);
                rt->dst.rt6_next = iter->dst.rt6_next;
                atomic_inc(&rt->rt6i_ref);
 +              call_fib6_entry_notifiers(info->nl_net, FIB_EVENT_ENTRY_REPLACE,
 +                                        rt);
                if (!info->skip_notify)
                        inet6_rt_notify(RTM_NEWROUTE, rt, info, NLM_F_REPLACE);
                if (!(fn->fn_flags & RTN_RTINFO)) {

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

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

diff --cc net/kcm/kcmsock.c
Simple merge

diff --cc net/packet/af_packet.c
Simple merge

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

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

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

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

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

diff --cc net/sched/sch_hfsc.c
index 7c7820d0fdc7afbf5e38c6845b09de88515d7551,11ab8dace901534b23b8f376ac704f995dc6b66b..daaf214e5201919ca3681e1670ac1389cb7985a4
--- 1/net/sched/sch_hfsc.c
--- 2/net/sched/sch_hfsc.c
+++ b/net/sched/sch_hfsc.c
@@@ -1390,9 -1432,10 +1392,9 @@@ hfsc_init_qdisc(struct Qdisc *sch, stru
  
        err = tcf_block_get(&q->root.block, &q->root.filter_list);
        if (err)
-               goto err_tcf;
+               return err;
  
        q->root.cl_common.classid = sch->handle;
 -      q->root.refcnt  = 1;
        q->root.sched   = q;
        q->root.qdisc = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops,
                                          sch->handle);

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

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

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

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

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

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

diff --cc net/tipc/bearer.c
Simple merge

diff --cc net/tipc/bearer.h
Simple merge

diff --cc net/tipc/node.c
Simple merge

diff --cc net/xfrm/xfrm_policy.c
Simple merge

diff --cc net/xfrm/xfrm_state.c
Simple merge

diff --cc net/xfrm/xfrm_user.c
Simple merge