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

Conflicts were all overlapping changes.

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

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/infiniband/hw/mlx5/qp.c
Simple merge

diff --cc drivers/net/dsa/ocelot/felix.c
Simple merge

diff --cc drivers/net/dsa/ocelot/felix.h
Simple merge

diff --cc drivers/net/dsa/ocelot/felix_vsc9959.c
Simple merge

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

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

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

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

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

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

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

diff --cc drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c
index c4ed25b,18719ac..b8d97d4
--- 1/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c
--- 2/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c
@@@ -693,6 -689,18 +693,12 @@@ static int dr_prepare_qp_to_rts(struct 
        return 0;
  }
  
 -static void dr_cq_event(struct mlx5_core_cq *mcq,
 -                      enum mlx5_event event)
 -{
 -      pr_info("CQ event %u on CQ #%u\n", event, mcq->cqn);
 -}
 -
+ static void dr_cq_complete(struct mlx5_core_cq *mcq,
+                          struct mlx5_eqe *eqe)
+ {
+       pr_err("CQ completion CQ: #%u\n", mcq->cqn);
+ }
+ 
  static struct mlx5dr_cq *dr_create_cq(struct mlx5_core_dev *mdev,
                                      struct mlx5_uars_page *uar,
                                      size_t ncqe)
@@@ -753,6 -761,9 +759,8 @@@
        pas = (__be64 *)MLX5_ADDR_OF(create_cq_in, in, pas);
        mlx5_fill_page_frag_array(&cq->wq_ctrl.buf, pas);
  
 -      cq->mcq.event = dr_cq_event;
+       cq->mcq.comp  = dr_cq_complete;
+ 
        err = mlx5_core_create_cq(mdev, &cq->mcq, in, inlen, out, sizeof(out));
        kvfree(in);
  

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

diff --cc drivers/net/ethernet/moxa/moxart_ether.c
Simple merge

diff --cc drivers/net/ethernet/mscc/ocelot.c
Simple merge

diff --cc drivers/net/ethernet/mscc/ocelot_regs.c
Simple merge

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

diff --cc drivers/net/ethernet/ti/Kconfig
Simple merge

diff --cc drivers/net/ethernet/ti/am65-cpsw-nuss.c
Simple merge

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

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

diff --cc drivers/net/ipa/ipa_endpoint.c
index 82066a2,a21534f..5fec30e
--- 1/drivers/net/ipa/ipa_endpoint.c
--- 2/drivers/net/ipa/ipa_endpoint.c
+++ b/drivers/net/ipa/ipa_endpoint.c
@@@ -1269,11 -1246,83 +1269,72 @@@ static void ipa_endpoint_reset(struct i
                        ret, endpoint->channel_id, endpoint->endpoint_id);
  }
  
+ static int ipa_endpoint_stop_rx_dma(struct ipa *ipa)
+ {
+       u16 size = IPA_ENDPOINT_STOP_RX_SIZE;
+       struct gsi_trans *trans;
+       dma_addr_t addr;
+       int ret;
+ 
+       trans = ipa_cmd_trans_alloc(ipa, 1);
+       if (!trans) {
+               dev_err(&ipa->pdev->dev,
+                       "no transaction for RX endpoint STOP workaround\n");
+               return -EBUSY;
+       }
+ 
+       /* Read into the highest part of the zero memory area */
+       addr = ipa->zero_addr + ipa->zero_size - size;
+ 
+       ipa_cmd_dma_task_32b_addr_add(trans, size, addr, false);
+ 
+       ret = gsi_trans_commit_wait_timeout(trans, ENDPOINT_STOP_DMA_TIMEOUT);
+       if (ret)
+               gsi_trans_free(trans);
+ 
+       return ret;
+ }
+ 
+ /**
+  * ipa_endpoint_stop() - Stops a GSI channel in IPA
+  * @client:   Client whose endpoint should be stopped
+  *
+  * This function implements the sequence to stop a GSI channel
+  * in IPA. This function returns when the channel is is STOP state.
+  *
+  * Return value: 0 on success, negative otherwise
+  */
+ int ipa_endpoint_stop(struct ipa_endpoint *endpoint)
+ {
+       u32 retries = IPA_ENDPOINT_STOP_RX_RETRIES;
+       int ret;
+ 
+       do {
+               struct ipa *ipa = endpoint->ipa;
+               struct gsi *gsi = &ipa->gsi;
+ 
+               ret = gsi_channel_stop(gsi, endpoint->channel_id);
+               if (ret != -EAGAIN || endpoint->toward_ipa)
+                       break;
+ 
+               /* For IPA v3.5.1, send a DMA read task and check again */
+               if (ipa->version == IPA_VERSION_3_5_1) {
+                       ret = ipa_endpoint_stop_rx_dma(ipa);
+                       if (ret)
+                               break;
+               }
+ 
+               msleep(1);
+       } while (retries--);
+ 
+       return retries ? ret : -EIO;
+ }
+ 
  static void ipa_endpoint_program(struct ipa_endpoint *endpoint)
  {
 -      struct device *dev = &endpoint->ipa->pdev->dev;
 -      int ret;
 -
        if (endpoint->toward_ipa) {
 -              bool delay_mode = endpoint->data->tx.delay;
 -
 -              ret = ipa_endpoint_init_ctrl(endpoint, delay_mode);
 -              /* Endpoint is expected to not be in delay mode */
 -              if (!ret != delay_mode) {
 -                      dev_warn(dev,
 -                              "TX endpoint %u was %sin delay mode\n",
 -                              endpoint->endpoint_id,
 -                              delay_mode ? "already " : "");
 -              }
 +              if (endpoint->ipa->version != IPA_VERSION_4_2)
 +                      ipa_endpoint_program_delay(endpoint, false);
                ipa_endpoint_init_hdr_ext(endpoint);
                ipa_endpoint_init_aggr(endpoint);
                ipa_endpoint_init_deaggr(endpoint);

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

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

diff --cc drivers/s390/net/qeth_core_main.c
Simple merge

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

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

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

diff --cc include/net/mptcp.h
index 5288fba,3bce201..e602756
--- 1/include/net/mptcp.h
--- 2/include/net/mptcp.h
+++ b/include/net/mptcp.h
@@@ -68,13 -68,8 +68,9 @@@ static inline bool rsk_is_mptcp(const s
        return tcp_rsk(req)->is_mptcp;
  }
  
- 
- void mptcp_parse_option(const struct sk_buff *skb, const unsigned char *ptr,
-                       int opsize, struct tcp_options_received *opt_rx);
 +void mptcp_space(const struct sock *ssk, int *space, int *full_space);
  bool mptcp_syn_options(struct sock *sk, const struct sk_buff *skb,
                       unsigned int *size, struct mptcp_out_options *opts);
- void mptcp_rcv_synsent(struct sock *sk);
  bool mptcp_synack_options(const struct request_sock *req, unsigned int *size,
                          struct mptcp_out_options *opts);
  bool mptcp_established_options(struct sock *sk, struct sk_buff *skb,

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

diff --cc include/soc/mscc/ocelot.h
Simple merge

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

diff --cc net/batman-adv/bat_v_ogm.c
Simple merge

diff --cc net/bridge/br_netlink.c
Simple merge

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

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

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

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

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

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

diff --cc net/sched/cls_api.c
index 7e85c91,0a7ecc2..299b963
--- 1/net/sched/cls_api.c
--- 2/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@@ -3527,27 -3523,16 +3527,37 @@@ static void tcf_sample_get_group(struc
  #endif
  }
  
 +static void tcf_gate_entry_destructor(void *priv)
 +{
 +      struct action_gate_entry *oe = priv;
 +
 +      kfree(oe);
 +}
 +
 +static int tcf_gate_get_entries(struct flow_action_entry *entry,
 +                              const struct tc_action *act)
 +{
 +      entry->gate.entries = tcf_gate_get_list(act);
 +
 +      if (!entry->gate.entries)
 +              return -EINVAL;
 +
 +      entry->destructor = tcf_gate_entry_destructor;
 +      entry->destructor_priv = entry->gate.entries;
 +
 +      return 0;
 +}
 +
+ static enum flow_action_hw_stats tc_act_hw_stats(u8 hw_stats)
+ {
+       if (WARN_ON_ONCE(hw_stats > TCA_ACT_HW_STATS_ANY))
+               return FLOW_ACTION_HW_STATS_DONT_CARE;
+       else if (!hw_stats)
+               return FLOW_ACTION_HW_STATS_DISABLED;
+ 
+       return hw_stats;
+ }
+ 
  int tc_setup_flow_action(struct flow_action *flow_action,
                         const struct tcf_exts *exts)
  {

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