Merge branch 'for-rc' into rdma.git
authorJason Gunthorpe <jgg@nvidia.com>
Tue, 17 Nov 2020 19:20:26 +0000 (15:20 -0400)
committerJason Gunthorpe <jgg@nvidia.com>
Tue, 17 Nov 2020 19:20:26 +0000 (15:20 -0400)
commitbf3b7b7ba9e3db55d164ec7bf05e6947f79637cd
tree7de81ebc8339c2a985b2af0e360368e281564c93
parent8a7904a672a1d33c848e5129f886ee69e0773a2e
parentdabbd6abcdbeb1358a53ec28a244429320eb0e3a
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>
drivers/infiniband/core/cm.c
drivers/infiniband/core/cma.c
drivers/infiniband/hw/mlx5/main.c
drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c
drivers/infiniband/sw/rdmavt/vt.c
drivers/infiniband/sw/rxe/rxe_net.c
drivers/infiniband/sw/rxe/rxe_verbs.c
drivers/infiniband/sw/siw/siw_main.c
drivers/infiniband/ulp/rtrs/rtrs-clt.c
drivers/infiniband/ulp/srpt/ib_srpt.c
drivers/nvme/host/rdma.c