David S. Miller 182ad468e7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/cavium/Kconfig

The cavium conflict was overlapping dependency
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2015-08-13 16:23:11 -07:00

..

af_rds.c

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

2015-06-24 16:49:49 -07:00

bind.c

RDS-TCP: Make RDS-TCP work correctly when it is set up in a netns other than init_net

2015-08-07 11:29:57 -07:00

cong.c

rds: rds_cong_queue_updates needs to defer the congestion update transmission

2015-02-11 14:35:44 -08:00

connection.c

RDS-TCP: Make RDS-TCP work correctly when it is set up in a netns other than init_net

2015-08-07 11:29:57 -07:00

ib_cm.c

RDS-TCP: Make RDS-TCP work correctly when it is set up in a netns other than init_net

2015-08-07 11:29:57 -07:00

ib_rdma.c

rds: rds_ib_device.refcount overflow

2015-07-14 13:20:11 -04:00

ib_recv.c

RDS: Switch to generic logging helpers

2015-05-18 13:44:23 -04: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

Merge branch 'for-4.2-misc' into k.o/for-4.2

2015-06-02 09:33:22 -04:00

ib_stats.c

RDS: Move atomic stats from general to ib-specific area

2010-09-08 18:12:20 -07: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

RDS-TCP: Make RDS-TCP work correctly when it is set up in a netns other than init_net

2015-08-07 11:29:57 -07:00

ib.h

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

2015-06-24 16:49:49 -07: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

iw_cm.c

RDS-TCP: Make RDS-TCP work correctly when it is set up in a netns other than init_net

2015-08-07 11:29:57 -07:00

iw_rdma.c

rds: avoid potential stack overflow

2015-03-12 00:28:01 -04:00

iw_recv.c

rds: switch ->inc_copy_to_user() to passing iov_iter

2014-11-24 05:16:43 -05:00

iw_ring.c

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

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

iw_send.c

rds: re-entry of rds_ib_xmit/rds_iw_xmit

2015-06-02 09:22:31 -04:00

iw_stats.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

2009-09-15 09:39:44 -07:00

iw_sysctl.c

rds: remove the unneed NULL checking

2014-05-09 15:59:45 -04:00

iw.c

RDS-TCP: Make RDS-TCP work correctly when it is set up in a netns other than init_net

2015-08-07 11:29:57 -07:00

iw.h

rds: switch ->inc_copy_to_user() to passing iov_iter

2014-11-24 05:16:43 -05:00

Kconfig

net/rds: remove depends on CONFIG_EXPERIMENTAL

2013-01-11 11:40:02 -08:00

loop.c

RDS: use gfp flags from caller in conn_alloc()

2012-03-22 19:29:58 -04:00

loop.h

RDS: loopback

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

Makefile

Net: rds: Makefile: Remove deprecated items

2010-11-22 08:16:15 -08:00

message.c

rds: Make rds_message_copy_from_user() return 0 on success.

2015-02-07 22:41:56 -08:00

page.c

net: Fix (nearly-)kernel-doc comments for various functions

2012-07-10 23:13:45 -07:00

rdma_transport.c

RDS: Switch to generic logging helpers

2015-05-18 13:44:23 -04:00

rdma_transport.h

rds: make local functions/variables static

2010-10-21 04:26:39 -07:00

rdma.c

rds: avoid calling sock_kfree_s() on allocation failure

2014-10-14 17:00:19 -04:00

rds.h

RDS-TCP: Make RDS-TCP work correctly when it is set up in a netns other than init_net

2015-08-07 11:29:57 -07:00

recv.c

net: Remove iocb argument from sendmsg and recvmsg

2015-03-02 13:06:31 -05:00

send.c

RDS-TCP: Make RDS-TCP work correctly when it is set up in a netns other than init_net

2015-08-07 11:29:57 -07:00

stats.c

net/rds: zero last byte for strncpy

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

sysctl.c

net: rds: use correct size for max unacked packets and bytes

2015-02-04 16:07:27 -08:00

tcp_connect.c

RDS-TCP: Support multiple RDS-TCP listen endpoints, one per netns.

2015-08-07 11:29:58 -07:00

tcp_listen.c

RDS-TCP: Support multiple RDS-TCP listen endpoints, one per netns.

2015-08-07 11:29:58 -07:00

tcp_recv.c

rds: switch ->inc_copy_to_user() to passing iov_iter

2014-11-24 05:16:43 -05:00

tcp_send.c

arch: Mass conversion of smp_mb__*()

2014-04-18 14:20:48 +02:00

tcp_stats.c

net: rds: fix const array syntax

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

tcp.c

RDS-TCP: Support multiple RDS-TCP listen endpoints, one per netns.

2015-08-07 11:29:58 -07:00

tcp.h

RDS-TCP: Support multiple RDS-TCP listen endpoints, one per netns.

2015-08-07 11:29:58 -07:00

threads.c

net/rds: call rds_conn_drop instead of open code it at rds_connect_complete

2014-10-03 12:51:59 -07:00

transport.c

RDS-TCP: Make RDS-TCP work correctly when it is set up in a netns other than init_net

2015-08-07 11:29:57 -07:00