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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/boot/dts/ls1021a-qds.dts
Simple merge

diff --cc arch/arm/boot/dts/ls1021a-twr.dts
Simple merge

diff --cc drivers/net/can/flexcan.c
index 3cd371c,760d2c0..634c51e
--- 1/drivers/net/can/flexcan.c
--- 2/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c
@@@ -541,11 -524,11 +541,11 @@@ static int flexcan_start_xmit(struct sk
  
        if (cf->can_dlc > 0) {
                data = be32_to_cpup((__be32 *)&cf->data[0]);
 -              flexcan_write(data, &priv->tx_mb->data[0]);
 +              priv->write(data, &priv->tx_mb->data[0]);
        }
-       if (cf->can_dlc > 3) {
+       if (cf->can_dlc > 4) {
                data = be32_to_cpup((__be32 *)&cf->data[4]);
 -              flexcan_write(data, &priv->tx_mb->data[1]);
 +              priv->write(data, &priv->tx_mb->data[1]);
        }
  
        can_put_echo_skb(skb, dev, 0);

diff --cc drivers/net/can/vxcan.c
Simple merge

diff --cc drivers/net/dsa/b53/b53_common.c
Simple merge

diff --cc drivers/net/ethernet/amazon/ena/ena_netdev.c
Simple merge

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

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

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

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

diff --cc drivers/net/ethernet/intel/i40e/i40e_txrx.c
Simple merge

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

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

diff --cc drivers/net/ethernet/renesas/sh_eth.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

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

diff --cc drivers/net/phy/phylink.c
index d1f9466,249ce5c..6ac8b29
--- 1/drivers/net/phy/phylink.c
--- 2/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@@ -1656,12 -1428,11 +1658,11 @@@ static void phylink_sfp_link_down(void 
  {
        struct phylink *pl = upstream;
  
 -      WARN_ON(!lockdep_rtnl_is_held());
 +      ASSERT_RTNL();
  
        set_bit(PHYLINK_DISABLE_LINK, &pl->phylink_disable_state);
+       queue_work(system_power_efficient_wq, &pl->resolve);
        flush_work(&pl->resolve);
- 
-       netif_carrier_off(pl->netdev);
  }
  
  static void phylink_sfp_link_up(void *upstream)

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

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

diff --cc include/linux/bpf.h
index 9e03046,b63a592..6be837c
--- 1/include/linux/bpf.h
--- 2/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@@ -529,10 -522,10 +537,12 @@@ static inline struct bpf_prog *bpf_prog
        return bpf_prog_get_type_dev(ufd, type, false);
  }
  
+ bool bpf_prog_get_ok(struct bpf_prog *, enum bpf_prog_type *, bool);
+ 
  int bpf_prog_offload_compile(struct bpf_prog *prog);
  void bpf_prog_offload_destroy(struct bpf_prog *prog);
 +int bpf_prog_offload_info_fill(struct bpf_prog_info *info,
 +                             struct bpf_prog *prog);
  
  #if defined(CONFIG_NET) && defined(CONFIG_BPF_SYSCALL)
  int bpf_prog_offload_init(struct bpf_prog *prog, union bpf_attr *attr);

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

diff --cc include/net/sctp/structs.h
Simple merge

diff --cc include/uapi/linux/if_ether.h
Simple merge

diff --cc include/uapi/linux/netfilter/nf_conntrack_common.h
Simple merge

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

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

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

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

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

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

diff --cc net/mac80211/rx.c
Simple merge

diff --cc net/netfilter/nf_tables_api.c
Simple merge

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

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

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

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

diff --cc net/wireless/nl80211.c
Simple merge