David S. Miller 0f3e9c97eb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... All of the conflicts were cases of overlapping changes. In net/core/devlink.c, we have to make care that the resouce size_params have become a struct member rather than a pointer to such an object. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-03-06 01:20:46 -05:00
..
af_rds.c	rds: deliver zerocopy completion notification with data	2018-02-27 14:19:11 -05:00
bind.c
cong.c	rds: tcp: use rds_destroy_pending() to synchronize netns/module teardown and rds connection/workq management	2018-02-08 15:23:52 -05:00
connection.c	rds: do not call ->conn_alloc with GFP_KERNEL	2018-02-13 13:52:02 -05:00
ib_cm.c	rds: tcp: use rds_destroy_pending() to synchronize netns/module teardown and rds connection/workq management	2018-02-08 15:23:52 -05:00
ib_fmr.c
ib_frmr.c
ib_mr.h
ib_rdma.c
ib_recv.c
ib_ring.c
ib_send.c
ib_stats.c
ib_sysctl.c
ib.c	rds: tcp: use rds_destroy_pending() to synchronize netns/module teardown and rds connection/workq management	2018-02-08 15:23:52 -05:00
ib.h
info.c
info.h
Kconfig
loop.c
loop.h
Makefile
message.c	rds: deliver zerocopy completion notification with data	2018-02-27 14:19:11 -05:00
page.c
rdma_transport.c
rdma_transport.h
rdma.c	RDS: null pointer dereference in rds_atomic_free_op	2018-01-04 14:19:26 -05:00
rds_single_path.h
rds.h	rds: deliver zerocopy completion notification with data	2018-02-27 14:19:11 -05:00
recv.c	rds: deliver zerocopy completion notification with data	2018-02-27 14:19:11 -05:00
send.c	rds: rds_msg_zcopy should return error of null rm->data.op_mmp_znotifier	2018-02-23 12:30:52 -05:00
stats.c
sysctl.c
tcp_connect.c	rds: tcp: use rds_destroy_pending() to synchronize netns/module teardown and rds connection/workq management	2018-02-08 15:23:52 -05:00
tcp_listen.c	rds: Incorrect reference counting in TCP socket creation	2018-03-02 09:40:27 -05:00
tcp_recv.c	rds: tcp: use rds_destroy_pending() to synchronize netns/module teardown and rds connection/workq management	2018-02-08 15:23:52 -05:00
tcp_send.c	rds: tcp: use rds_destroy_pending() to synchronize netns/module teardown and rds connection/workq management	2018-02-08 15:23:52 -05:00
tcp_stats.c
tcp.c	net: make getname() functions return length rather than use int* parameter	2018-02-12 14:15:04 -05:00
tcp.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-01-23 13:51:56 -05:00
threads.c	rds: tcp: use rds_destroy_pending() to synchronize netns/module teardown and rds connection/workq management	2018-02-08 15:23:52 -05:00
transport.c