mirror of
https://github.com/torvalds/linux.git
synced 2024-11-19 18:41:48 +00:00
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>
|
||
|---|---|---|
| .. | ||
| admin-cmd.c | ||
| configfs.c | ||
| core.c | ||
| discovery.c | ||
| fabrics-cmd.c | ||
| fc.c | ||
| fcloop.c | ||
| io-cmd-bdev.c | ||
| io-cmd-file.c | ||
| Kconfig | ||
| loop.c | ||
| Makefile | ||
| nvmet.h | ||
| rdma.c | ||