Merge tag 'v5.13-rc7' into rdma.git for-next

Linux 5.13-rc7

Needed for dependencies in following patches. Merge conflict in rxe_cmop.c
resolved by compining both patches.

Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/infiniband/core/uverbs_cmd.c
Simple merge

diff --cc drivers/infiniband/hw/mlx4/main.c
Simple merge

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

diff --cc drivers/infiniband/hw/mlx5/doorbell.c
index 913af759c2c280d20a2101d4e19b77a132d4024c,7af4df7a6823787e07250fe11fa89bc637bda00a..9ca2e61807ec98c5f5efda5670f30fe3c267a8c1
--- 1/drivers/infiniband/hw/mlx5/doorbell.c
--- 2/drivers/infiniband/hw/mlx5/doorbell.c
+++ b/drivers/infiniband/hw/mlx5/doorbell.c
@@@ -41,9 -41,11 +41,10 @@@ struct mlx5_ib_user_db_page 
        struct ib_umem         *umem;
        unsigned long           user_virt;
        int                     refcnt;
+       struct mm_struct        *mm;
  };
  
 -int mlx5_ib_db_map_user(struct mlx5_ib_ucontext *context,
 -                      struct ib_udata *udata, unsigned long virt,
 +int mlx5_ib_db_map_user(struct mlx5_ib_ucontext *context, unsigned long virt,
                        struct mlx5_db *db)
  {
        struct mlx5_ib_user_db_page *page;

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

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

diff --cc drivers/infiniband/sw/rxe/rxe_comp.c
index d4ceb81a96df5de9b1fe0b9dd89b0bd43bb932c3,a6712e373eed633cdddf0a993f57e45e521a6f06..58ad9c2644f3d2bf168432351ed5a737aaccfab7
--- 1/drivers/infiniband/sw/rxe/rxe_comp.c
--- 2/drivers/infiniband/sw/rxe/rxe_comp.c
+++ b/drivers/infiniband/sw/rxe/rxe_comp.c
@@@ -349,9 -345,11 +349,11 @@@ static inline enum comp_state do_read(s
  
        ret = copy_data(qp->pd, IB_ACCESS_LOCAL_WRITE,
                        &wqe->dma, payload_addr(pkt),
 -                      payload_size(pkt), to_mr_obj, NULL);
 +                      payload_size(pkt), RXE_TO_MR_OBJ, NULL);
-       if (ret)
+       if (ret) {
+               wqe->status = IB_WC_LOC_PROT_ERR;
                return COMPST_ERROR;
+       }
  
        if (wqe->dma.resid == 0 && (pkt->mask & RXE_END_MASK))
                return COMPST_COMP_ACK;
@@@ -369,11 -367,13 +371,13 @@@ static inline enum comp_state do_atomic
  
        ret = copy_data(qp->pd, IB_ACCESS_LOCAL_WRITE,
                        &wqe->dma, &atomic_orig,
 -                      sizeof(u64), to_mr_obj, NULL);
 +                      sizeof(u64), RXE_TO_MR_OBJ, NULL);
-       if (ret)
+       if (ret) {
+               wqe->status = IB_WC_LOC_PROT_ERR;
                return COMPST_ERROR;
-       else
-               return COMPST_COMP_ACK;
+       }
+ 
+       return COMPST_COMP_ACK;
  }
  
  static void make_send_cqe(struct rxe_qp *qp, struct rxe_send_wqe *wqe,

diff --cc drivers/infiniband/sw/rxe/rxe_qp.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice.h
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_hw_autogen.h
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_lib.c
Simple merge

diff --cc drivers/net/ethernet/intel/ice/ice_main.c
Simple merge