Merge branch 'for-rc' into rdma.git

From https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git

The rc RDMA branch is needed due to dependencies on the next patches.

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

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

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

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

diff --cc drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c
Simple merge

diff --cc drivers/infiniband/sw/rdmavt/vt.c
Simple merge

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

diff --cc drivers/infiniband/sw/rxe/rxe_verbs.c
index 209c7b3,f9c832e..bbc8900
--- 1/drivers/infiniband/sw/rxe/rxe_verbs.c
--- 2/drivers/infiniband/sw/rxe/rxe_verbs.c
+++ b/drivers/infiniband/sw/rxe/rxe_verbs.c
@@@ -1140,10 -1131,43 +1141,13 @@@ int rxe_register_device(struct rxe_dev 
                            rxe->ndev->dev_addr);
        dev->dev.dma_parms = &rxe->dma_parms;
        dma_set_max_seg_size(&dev->dev, UINT_MAX);
-       dma_set_coherent_mask(&dev->dev, dma_get_required_mask(&dev->dev));
+       dma_mask = IS_ENABLED(CONFIG_64BIT) ? DMA_BIT_MASK(64) : DMA_BIT_MASK(32);
+       err = dma_coerce_mask_and_coherent(&dev->dev, dma_mask);
+       if (err)
+               return err;
  
 -      dev->uverbs_cmd_mask = BIT_ULL(IB_USER_VERBS_CMD_GET_CONTEXT)
 -          | BIT_ULL(IB_USER_VERBS_CMD_CREATE_COMP_CHANNEL)
 -          | BIT_ULL(IB_USER_VERBS_CMD_QUERY_DEVICE)
 -          | BIT_ULL(IB_USER_VERBS_CMD_QUERY_PORT)
 -          | BIT_ULL(IB_USER_VERBS_CMD_ALLOC_PD)
 -          | BIT_ULL(IB_USER_VERBS_CMD_DEALLOC_PD)
 -          | BIT_ULL(IB_USER_VERBS_CMD_CREATE_SRQ)
 -          | BIT_ULL(IB_USER_VERBS_CMD_MODIFY_SRQ)
 -          | BIT_ULL(IB_USER_VERBS_CMD_QUERY_SRQ)
 -          | BIT_ULL(IB_USER_VERBS_CMD_DESTROY_SRQ)
 -          | BIT_ULL(IB_USER_VERBS_CMD_POST_SRQ_RECV)
 -          | BIT_ULL(IB_USER_VERBS_CMD_CREATE_QP)
 -          | BIT_ULL(IB_USER_VERBS_CMD_MODIFY_QP)
 -          | BIT_ULL(IB_USER_VERBS_CMD_QUERY_QP)
 -          | BIT_ULL(IB_USER_VERBS_CMD_DESTROY_QP)
 -          | BIT_ULL(IB_USER_VERBS_CMD_POST_SEND)
 -          | BIT_ULL(IB_USER_VERBS_CMD_POST_RECV)
 -          | BIT_ULL(IB_USER_VERBS_CMD_CREATE_CQ)
 -          | BIT_ULL(IB_USER_VERBS_CMD_RESIZE_CQ)
 -          | BIT_ULL(IB_USER_VERBS_CMD_DESTROY_CQ)
 -          | BIT_ULL(IB_USER_VERBS_CMD_POLL_CQ)
 -          | BIT_ULL(IB_USER_VERBS_CMD_PEEK_CQ)
 -          | BIT_ULL(IB_USER_VERBS_CMD_REQ_NOTIFY_CQ)
 -          | BIT_ULL(IB_USER_VERBS_CMD_REG_MR)
 -          | BIT_ULL(IB_USER_VERBS_CMD_DEREG_MR)
 -          | BIT_ULL(IB_USER_VERBS_CMD_CREATE_AH)
 -          | BIT_ULL(IB_USER_VERBS_CMD_MODIFY_AH)
 -          | BIT_ULL(IB_USER_VERBS_CMD_QUERY_AH)
 -          | BIT_ULL(IB_USER_VERBS_CMD_DESTROY_AH)
 -          | BIT_ULL(IB_USER_VERBS_CMD_ATTACH_MCAST)
 -          | BIT_ULL(IB_USER_VERBS_CMD_DETACH_MCAST)
 -          ;
 +      dev->uverbs_cmd_mask |= BIT_ULL(IB_USER_VERBS_CMD_POST_SEND) |
 +                              BIT_ULL(IB_USER_VERBS_CMD_REQ_NOTIFY_CQ);
  
        ib_set_device_ops(dev, &rxe_dev_ops);
        err = ib_device_set_netdev(&rxe->ib_dev, rxe->ndev, 1);

diff --cc drivers/infiniband/sw/siw/siw_main.c
Simple merge

diff --cc drivers/infiniband/ulp/rtrs/rtrs-clt.c
Simple merge

diff --cc drivers/infiniband/ulp/srpt/ib_srpt.c
Simple merge

diff --cc drivers/nvme/host/rdma.c
Simple merge