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
..
ipoib	IB/ipoib: Consolidate checking of the proposed child interface	2018-08-02 20:27:44 -06:00
iser	Merge branch 'linus/master' into rdma.git for-next	2018-08-16 14:21:29 -06:00
isert	IB/isert: Simplify ib_post_(send|recv|srq_recv)() calls	2018-07-24 16:06:36 -06:00
opa_vnic	net: allow ndo_select_queue to pass netdev	2018-07-09 13:41:34 -07:00
srp	RDMA/cma: Constify path record, ib_cm_event, listen_id pointers	2018-07-30 20:49:04 -06:00
srpt	Merge branch 'linus/master' into rdma.git for-next	2018-08-16 14:21:29 -06:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00