forked from Minki/linux
0a3173a5f0
rdma.git merge resolution for the 4.19 merge window
Conflicts:
drivers/infiniband/core/rdma_core.c
- Use the rdma code and revise with the new spelling for
atomic_fetch_add_unless
drivers/nvme/host/rdma.c
- Replace max_sge with max_send_sge in new blk code
drivers/nvme/target/rdma.c
- Use the blk code and revise to use NULL for ib_post_recv when
appropriate
- Replace max_sge with max_recv_sge in new blk code
net/rds/ib_send.c
- Use the net code and revise to use NULL for ib_post_recv when
appropriate
Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
|
||
|---|---|---|
| .. | ||
| hns_roce_ah.c | ||
| hns_roce_alloc.c | ||
| hns_roce_cmd.c | ||
| hns_roce_cmd.h | ||
| hns_roce_common.h | ||
| hns_roce_cq.c | ||
| hns_roce_db.c | ||
| hns_roce_device.h | ||
| hns_roce_hem.c | ||
| hns_roce_hem.h | ||
| hns_roce_hw_v1.c | ||
| hns_roce_hw_v1.h | ||
| hns_roce_hw_v2.c | ||
| hns_roce_hw_v2.h | ||
| hns_roce_main.c | ||
| hns_roce_mr.c | ||
| hns_roce_pd.c | ||
| hns_roce_qp.c | ||
| Kconfig | ||
| Makefile | ||