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

All conflicts seemed rather trivial, with some guidance from
Saeed Mameed on the tc_ct.c one.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/net/dsa/microchip/ksz8795.c
Simple merge

diff --cc drivers/net/dsa/microchip/ksz9477.c
Simple merge

diff --cc drivers/net/ethernet/cadence/macb_main.c
Simple merge

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

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

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

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

diff --cc drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
Simple merge

diff --cc drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c
Simple merge

diff --cc drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.h
Simple merge

diff --cc drivers/net/ethernet/marvell/mvneta.c
Simple merge

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en/port.c
index be83db6,3cf3e35..5de1cb9
--- 1/drivers/net/ethernet/mellanox/mlx5/core/en/port.c
--- 2/drivers/net/ethernet/mellanox/mlx5/core/en/port.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en/port.c
@@@ -76,11 -76,23 +76,26 @@@ static const u32 mlx5e_ext_link_speed[M
        [MLX5E_100GAUI_2_100GBASE_CR2_KR2]      = 100000,
        [MLX5E_200GAUI_4_200GBASE_CR4_KR4]      = 200000,
        [MLX5E_400GAUI_8]                       = 400000,
 +      [MLX5E_100GAUI_1_100GBASE_CR_KR]        = 100000,
 +      [MLX5E_200GAUI_2_200GBASE_CR2_KR2]      = 200000,
 +      [MLX5E_400GAUI_4_400GBASE_CR4_KR4]      = 400000,
  };
  
+ bool mlx5e_ptys_ext_supported(struct mlx5_core_dev *mdev)
+ {
+       struct mlx5e_port_eth_proto eproto;
+       int err;
+ 
+       if (MLX5_CAP_PCAM_FEATURE(mdev, ptys_extended_ethernet))
+               return true;
+ 
+       err = mlx5_port_query_eth_proto(mdev, 1, true, &eproto);
+       if (err)
+               return false;
+ 
+       return !!eproto.cap;
+ }
+ 
  static void mlx5e_port_get_speed_arr(struct mlx5_core_dev *mdev,
                                     const u32 **arr, u32 *size,
                                     bool force_legacy)

diff --cc drivers/net/ethernet/mellanox/mlx5/core/en/rep/neigh.c
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
index e054726,081f150..4e5d83f
--- 1/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
--- 2/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@@ -5150,14 -5118,12 +5147,18 @@@ static int mlx5e_init_nic_rx(struct mlx
        if (err)
                goto err_destroy_flow_steering;
  
 +      err = mlx5e_accel_init_rx(priv);
 +      if (err)
 +              goto err_tc_nic_cleanup;
 +
+ #ifdef CONFIG_MLX5_EN_ARFS
+       priv->netdev->rx_cpu_rmap =  mlx5_eq_table_get_rmap(priv->mdev);
+ #endif
+ 
        return 0;
  
 +err_tc_nic_cleanup:
 +      mlx5e_tc_nic_cleanup(priv);
  err_destroy_flow_steering:
        mlx5e_destroy_flow_steering(priv);
  err_destroy_xsk_tirs:

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

diff --cc drivers/net/ethernet/qlogic/qed/qed.h
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_debug.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_dev.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_mcp.c
Simple merge

diff --cc drivers/net/ethernet/qlogic/qed/qed_mcp.h
Simple merge

diff --cc drivers/net/ipa/gsi.c
index c84b8d9,ac7e5a0..1ab41e0
--- 1/drivers/net/ipa/gsi.c
--- 2/drivers/net/ipa/gsi.c
+++ b/drivers/net/ipa/gsi.c
@@@ -508,11 -500,16 +508,18 @@@ static int gsi_channel_stop_command(str
        int ret;
  
        state = gsi_channel_state(channel);
+ 
+       /* Channel could have entered STOPPED state since last call
+        * if it timed out.  If so, we're done.
+        */
+       if (state == GSI_CHANNEL_STATE_STOPPED)
+               return 0;
+ 
        if (state != GSI_CHANNEL_STATE_STARTED &&
 -          state != GSI_CHANNEL_STATE_STOP_IN_PROC)
 +          state != GSI_CHANNEL_STATE_STOP_IN_PROC) {
 +              dev_err(dev, "bad channel state %u before stop\n", state);
                return -EINVAL;
 +      }
  
        ret = gsi_channel_command(channel, GSI_CH_STOP);
  

diff --cc drivers/net/ipa/ipa_endpoint.c
Simple merge

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

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

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

diff --cc include/uapi/linux/bpf.h
index da9bf35,8bd3305..ea382e4
--- 1/include/uapi/linux/bpf.h
--- 2/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@@ -3222,9 -3220,9 +3223,9 @@@ union bpf_attr 
   *            power heuristics and for reporting, not to make 100% correct
   *            calculation.
   *    Return
-  *            Requested value, or 0, if flags are not recognized.
+  *            Requested value, or 0, if *flags* are not recognized.
   *
 - * int bpf_csum_level(struct sk_buff *skb, u64 level)
 + * long bpf_csum_level(struct sk_buff *skb, u64 level)
   *    Description
   *            Change the skbs checksum level by one layer up or down, or
   *            reset it entirely to none in order to have the stack perform

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

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

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

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

diff --cc net/bridge/br_private.h
Simple merge

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

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

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

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

diff --cc net/hsr/hsr_device.c
Simple merge

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

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

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

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

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

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

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

diff --cc net/mptcp/options.c
Simple merge

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

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

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

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

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

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

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

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

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

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

diff --cc tools/include/uapi/linux/bpf.h
index da9bf35,8bd3305..ea382e4
--- 1/tools/include/uapi/linux/bpf.h
--- 2/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
@@@ -3222,9 -3220,9 +3223,9 @@@ union bpf_attr 
   *            power heuristics and for reporting, not to make 100% correct
   *            calculation.
   *    Return
-  *            Requested value, or 0, if flags are not recognized.
+  *            Requested value, or 0, if *flags* are not recognized.
   *
 - * int bpf_csum_level(struct sk_buff *skb, u64 level)
 + * long bpf_csum_level(struct sk_buff *skb, u64 level)
   *    Description
   *            Change the skbs checksum level by one layer up or down, or
   *            reset it entirely to none in order to have the stack perform

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

diff --cc tools/testing/selftests/bpf/progs/bpf_iter_netlink.c
Simple merge