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
..
Kconfig	Update broken web addresses in the kernel.	2010-10-18 11:03:14 +02:00
Makefile	IB/iser: iSER Kconfig and Makefile	2006-06-22 07:51:14 -07:00
iscsi_iser.c	IB/iser: Remove set-but-not-used variables	2018-07-09 12:11:22 -06:00
iscsi_iser.h	IB/iser: use T10-PI check mask definitions from core layer	2018-06-04 09:19:24 -06:00
iser_initiator.c	treewide: kmalloc() -> kmalloc_array()	2018-06-12 16:19:22 -07:00
iser_memory.c	Merge branch 'linus/master' into rdma.git for-next	2018-08-16 14:21:29 -06:00
iser_verbs.c	IB/iser: Simplify ib_post_(send|recv|srq_recv)() calls	2018-07-24 16:06:36 -06:00