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
..
client.c	net/9p/client.c: put refcount of trans_mod in error case in parse_opts()	2018-07-14 11:11:09 -07:00
error.c
Kconfig	IB: Revert "remove redundant INFINIBAND kconfig dependencies"	2018-05-28 10:40:16 -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
mod.c	net:mod: remove unneeded variable 'ret' in init_p9	2018-08-08 09:40:44 -07:00
protocol.c	treewide: kmalloc() -> kmalloc_array()	2018-06-12 16:19:22 -07:00
protocol.h
trans_common.c	net/9p: correct some comment errors in 9p file system code	2018-05-10 08:21:53 -04:00
trans_common.h
trans_fd.c	Merge branch 'work.aio-1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2018-06-04 13:57:43 -07:00
trans_rdma.c	net/9p: Simplify ib_post_(send|recv|srq_recv)() calls	2018-07-24 16:06:36 -06:00
trans_virtio.c	treewide: kmalloc() -> kmalloc_array()	2018-06-12 16:19:22 -07:00
trans_xen.c	net/9p/trans_xen.c: don't inclide rwlock.h directly	2018-06-07 17:34:34 -07:00
util.c