kernel_optimize_test/net/rds
David S. Miller 3118e6e19d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The UDP offload conflict is dealt with by simply taking what is
in net-next where we have removed all of the UFO handling code
entirely.

The TCP conflict was a case of local variables in a function
being removed from both net and net-next.

In netvsc we had an assignment right next to where a missing
set of u64 stats sync object inits were added.

Signed-off-by: David S. Miller <davem@davemloft.net>
2017-08-09 16:28:45 -07:00
..
af_rds.c
bind.c
cong.c
connection.c rds: reduce memory footprint for RDS when transport is RDMA 2017-08-03 09:27:59 -07:00
ib_cm.c
ib_fmr.c
ib_frmr.c
ib_mr.h
ib_rdma.c net, rds: convert rds_ib_device.refcount from atomic_t to refcount_t 2017-07-04 22:35:17 +01:00
ib_recv.c rds: Reintroduce statistics counting 2017-08-08 21:03:47 -07:00
ib_ring.c
ib_send.c
ib_stats.c
ib_sysctl.c
ib.c net, rds: convert rds_ib_device.refcount from atomic_t to refcount_t 2017-07-04 22:35:17 +01:00
ib.h net, rds: convert rds_ib_device.refcount from atomic_t to refcount_t 2017-07-04 22:35:17 +01:00
info.c
info.h
Kconfig
loop.c
loop.h
Makefile
message.c net, rds: convert rds_message.m_refcount from atomic_t to refcount_t 2017-07-04 22:35:18 +01:00
page.c
rdma_transport.c
rdma_transport.h
rdma.c net, rds: convert rds_mr.r_refcount from atomic_t to refcount_t 2017-07-04 22:35:17 +01:00
rds_single_path.h
rds.h rds: reduce memory footprint for RDS when transport is RDMA 2017-08-03 09:27:59 -07:00
recv.c net, rds: convert rds_incoming.i_refcount from atomic_t to refcount_t 2017-07-04 22:35:17 +01:00
send.c rds: Make sure updates to cp_send_gen can be observed 2017-07-20 15:33:01 -07:00
stats.c
sysctl.c
tcp_connect.c rds: cancel send/recv work before queuing connection shutdown 2017-07-16 19:07:35 -07:00
tcp_listen.c rds: tcp: use sock_create_lite() to create the accept socket 2017-07-08 11:16:16 +01:00
tcp_recv.c
tcp_send.c rds: cancel send/recv work before queuing connection shutdown 2017-07-16 19:07:35 -07:00
tcp_stats.c
tcp.c rds: cancel send/recv work before queuing connection shutdown 2017-07-16 19:07:35 -07:00
tcp.h rds: tcp: set linger to 1 when unloading a rds-tcp 2017-06-22 11:34:04 -04:00
threads.c rds: cancel send/recv work before queuing connection shutdown 2017-07-16 19:07:35 -07:00
transport.c