Jason Gunthorpe 0a3173a5f0 Merge branch 'linus/master' into rdma.git for-next ... 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>		2018-08-16 14:21:29 -06:00
..
ib_dm_mad.h	ib_srpt: Initial SRP Target merge for v3.3-rc1	2011-12-16 06:33:56 +00:00
ib_srpt.c	Merge branch 'linus/master' into rdma.git for-next	2018-08-16 14:21:29 -06:00
ib_srpt.h	IB/srpt: Support HCAs with more than two ports	2018-06-29 14:35:45 -06:00
Kconfig	IB: Revert "remove redundant INFINIBAND kconfig dependencies"	2018-05-28 10:40:16 -06:00
Makefile	ib_srpt: Initial SRP Target merge for v3.3-rc1	2011-12-16 06:33:56 +00:00