![]() 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> |
||
---|---|---|
.. | ||
client.c | ||
error.c | ||
Kconfig | ||
Makefile | ||
mod.c | ||
protocol.c | ||
protocol.h | ||
trans_common.c | ||
trans_common.h | ||
trans_fd.c | ||
trans_rdma.c | ||
trans_virtio.c | ||
trans_xen.c | ||
util.c |