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
..
auth_gss	net: Remove some unneeded semicolon	2018-08-04 13:05:39 -07:00
xprtrdma	RDMA, core and ULPs: Declare ib_post_send() and ib_post_recv() arguments const	2018-07-30 20:09:34 -06:00
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
addr.c	replace strict_strto calls	2014-07-12 18:45:49 -04:00
auth.c	sched/headers: Prepare to remove <linux/cred.h> inclusion from <linux/sched.h>	2017-03-02 08:42:31 +01:00
auth_generic.c	NFS client updates for Linux 4.9	2016-10-13 21:28:20 -07:00
auth_null.c	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
auth_unix.c	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
backchannel_rqst.c	SUNRPC: Don't hold the transport lock when receiving backchannel data	2017-08-16 15:10:16 -04:00
cache.c	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
clnt.c	SUNRPC: Initialize rpc_rqst outside of xprt->reserve_lock	2018-05-07 09:20:03 -04:00
debugfs.c	net: Use octal not symbolic permissions	2018-03-26 12:07:48 -04:00
netns.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
rpc_pipe.c	Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2018-06-04 10:14:28 -07:00
rpcb_clnt.c	sunrpc: remove net pointer from messages	2017-11-17 16:43:51 -05:00
sched.c	sunrpc: Simplify synopsis of some trace points	2018-04-10 16:06:22 -04:00
socklib.c	sunrpc: do not pull udp headers on receive	2016-04-11 15:31:33 -04:00
stats.c	sunrpc: Add static trace point to report RPC latency stats	2018-04-10 16:06:22 -04:00
sunrpc.h	xprtrdma: "Support" call-only RPCs	2018-04-10 16:06:22 -04:00
sunrpc_syms.c	net: Drop pernet_operations::async	2018-03-27 13:18:09 -04:00
svc.c	NFSD: Clean up legacy NFS SYMLINK argument XDR decoders	2018-04-03 15:08:16 -04:00
svc_xprt.c	svc: Report xprt dequeue latency	2018-04-03 15:08:13 -04:00
svcauth.c	locking/atomic, kref: Implement kref_put_lock()	2017-01-18 10:03:29 +01:00
svcauth_unix.c	kernel: make groups_sort calling a responsibility group_info allocators	2017-12-14 16:00:49 -08:00
svcsock.c	Chuck Lever did a bunch of work on nfsd tracepoints, on RDMA, and on	2018-04-05 19:15:29 -07:00
sysctl.c	Replace <asm/uaccess.h> with <linux/uaccess.h> globally	2016-12-24 11:46:01 -08:00
timer.c	net: cleanup unsigned to unsigned int	2012-04-15 12:44:40 -04:00
xdr.c	SUNRPC: Add helpers for decoding opaque and string types	2018-04-10 16:06:22 -04:00
xprt.c	sunrpc: Prevent duplicate XID allocation	2018-06-19 08:53:48 -04:00
xprtmultipath.c	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
xprtsock.c	SUNRPC: Add a ->free_slot transport callout	2018-05-07 09:20:03 -04:00