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

RDS: validate the requested traces user input against max supported

2017-01-06 22:14:26 -05:00

bind.c

RDS: log the address on bind failure

2017-01-02 14:02:39 -08:00

cong.c

RDS: split out connection specific state from rds_connection to rds_conn_path

2016-06-14 23:50:41 -07:00

connection.c

rds: reduce memory footprint for RDS when transport is RDMA

2017-08-03 09:27:59 -07:00

ib_cm.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2017-03-15 11:59:10 -07:00

ib_fmr.c

rds: ib: unmap the scatter/gather list when error

2017-03-13 23:20:05 -07:00

ib_frmr.c

RDS: IB: split the mr registration and invalidation path

2017-01-02 14:02:47 -08:00

ib_mr.h

rds: ib: add the static type to the function

2017-03-13 23:20:05 -07:00

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

RDS/IW+IB: Set recv ring low water mark to 1/2 full.

2009-04-09 17:21:14 -07:00

ib_send.c

rds:Remove unnecessary ib_ring unalloc

2017-02-17 15:19:51 -05:00

ib_stats.c

RDS: IB: add few useful cache stasts

2017-01-02 14:02:51 -08:00

ib_sysctl.c

net: Convert uses of typedef ctl_table to struct ctl_table

2013-06-13 02:36:09 -07:00

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

rds: fix an integer overflow test in rds_info_getsockopt()

2015-08-03 15:20:16 -07:00

info.h

RDS: Info and stats

2009-02-26 23:39:25 -08:00

Kconfig

RDS: Drop stale iWARP RDMA transport

2016-03-02 14:13:17 -05:00

loop.c

RDS: TCP: Hooks to set up a single connection path

2016-07-01 16:45:17 -04:00

loop.h

RDS: loopback

2009-02-26 23:39:26 -08:00

Makefile

rds: debug messages are enabled by default

2016-10-29 15:55:57 -04:00

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

rds: remove dead code

2016-12-26 21:35:39 -05:00

rdma_transport.c

RDS: RDMA: start rdma listening after init

2017-01-02 14:02:45 -08:00

rdma_transport.h

RDS: Drop stale iWARP RDMA transport

2016-03-02 14:13:17 -05:00

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: split out connection specific state from rds_connection to rds_conn_path

2016-06-14 23:50:41 -07:00

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

net/rds: zero last byte for strncpy

2013-03-08 00:35:44 -05:00

sysctl.c

net: rds: fix coding style issues

2016-06-18 21:34:09 -07:00

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

RDS: add receive message trace used by application

2017-01-02 14:02:59 -08:00

tcp_send.c

rds: cancel send/recv work before queuing connection shutdown

2017-07-16 19:07:35 -07:00

tcp_stats.c

net: rds: fix const array syntax

2011-07-01 16:16:19 -07:00

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

rds: remove unnecessary returned value check

2017-03-03 09:51:22 -08:00