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	rds: fix building with IPV6=m	2018-08-14 10:06:37 -07:00
Makefile	rds: remove trailing whitespace and blank lines	2018-07-24 14:10:42 -07:00
af_rds.c	rds: Remove IPv6 dependency	2018-08-01 09:32:35 -07:00
bind.c	rds: Remove IPv6 dependency	2018-08-01 09:32:35 -07:00
cong.c	rds: Changing IP address internal representation to struct in6_addr	2018-07-23 21:17:44 -07:00
connection.c	rds: Remove IPv6 dependency	2018-08-01 09:32:35 -07:00
ib.c	Merge branch 'linus/master' into rdma.git for-next	2018-08-16 14:21:29 -06:00
ib.h	rds: rds_ib_recv_alloc_cache() should call alloc_percpu_gfp() instead	2018-08-01 09:32:35 -07:00
ib_cm.c	rds: Remove IPv6 dependency	2018-08-01 09:32:35 -07:00
ib_fmr.c	net/rds/ib_fmr.c: use kmalloc_array_node()	2017-11-15 18:21:02 -08:00
ib_frmr.c	Merge branch 'linus/master' into rdma.git for-next	2018-08-16 14:21:29 -06:00
ib_mr.h	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
ib_rdma.c	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
ib_recv.c	Merge branch 'linus/master' into rdma.git for-next	2018-08-16 14:21:29 -06:00
ib_ring.c	…
ib_send.c	Merge branch 'linus/master' into rdma.git for-next	2018-08-16 14:21:29 -06:00
ib_stats.c	…
ib_sysctl.c	…
info.c	treewide: kmalloc() -> kmalloc_array()	2018-06-12 16:19:22 -07:00
info.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
loop.c	rds: Changing IP address internal representation to struct in6_addr	2018-07-23 21:17:44 -07:00
loop.h	rds: clean up loopback rds_connections on netns deletion	2018-06-27 10:11:03 +09:00
message.c	rds: remove trailing whitespace and blank lines	2018-07-24 14:10:42 -07:00
page.c	…
rdma.c	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
rdma_transport.c	rds: Remove IPv6 dependency	2018-08-01 09:32:35 -07:00
rdma_transport.h	rds: Enable RDS IPv6 support	2018-07-23 21:17:44 -07:00
rds.h	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
rds_single_path.h	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
recv.c	rds: Remove IPv6 dependency	2018-08-01 09:32:35 -07:00
send.c	Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net	2018-08-02 10:55:32 -07:00
stats.c	…
sysctl.c	…
tcp.c	rds: Remove IPv6 dependency	2018-08-01 09:32:35 -07:00
tcp.h	rds: Enable RDS IPv6 support	2018-07-23 21:17:44 -07:00
tcp_connect.c	rds: Enable RDS IPv6 support	2018-07-23 21:17:44 -07:00
tcp_listen.c	rds: Remove IPv6 dependency	2018-08-01 09:32:35 -07:00
tcp_recv.c	rds: Changing IP address internal representation to struct in6_addr	2018-07-23 21:17:44 -07:00
tcp_send.c	rds: Changing IP address internal representation to struct in6_addr	2018-07-23 21:17:44 -07:00
tcp_stats.c	…
threads.c	rds: Changing IP address internal representation to struct in6_addr	2018-07-23 21:17:44 -07:00
transport.c	rds: remove trailing whitespace and blank lines	2018-07-24 14:10:42 -07:00