David S. Miller 87ffabb1f0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

The dwmac-socfpga.c conflict was a case of a bug fix overlapping
changes in net-next to handle an error pointer differently.

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

2015-04-14 15:44:14 -04:00

..

af_rds.c

…

bind.c

…

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: make sure not to loop forever inside rds_send_xmit

2015-04-08 15:17:32 -04:00

ib_cm.c

…

ib_rdma.c

…

ib_recv.c

rds: switch ->inc_copy_to_user() to passing iov_iter

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

ib_ring.c

…

ib_send.c

net: rds: Remove repeated function names from debug output

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

ib_stats.c

…

ib_sysctl.c

…

ib.c

…

ib.h

rds: switch ->inc_copy_to_user() to passing iov_iter

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

info.c

…

info.h

…

iw_cm.c

net: rds: Remove repeated function names from debug output

2015-02-07 22:41:56 -08: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

…

iw_send.c

net: rds: Remove repeated function names from debug output

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

iw_stats.c

…

iw_sysctl.c

…

iw.c

…

iw.h

rds: switch ->inc_copy_to_user() to passing iov_iter

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

Kconfig

…

loop.c

…

loop.h

…

Makefile

…

message.c

rds: Make rds_message_copy_from_user() return 0 on success.

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

page.c

…

rdma_transport.c

…

rdma_transport.h

…

rdma.c

…

rds.h

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

2015-04-14 15:44:14 -04:00

recv.c

net: Remove iocb argument from sendmsg and recvmsg

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

send.c

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

2015-04-14 15:44:14 -04:00

stats.c

…

sysctl.c

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

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

tcp_connect.c

…

tcp_listen.c

…

tcp_recv.c

rds: switch ->inc_copy_to_user() to passing iov_iter

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

tcp_send.c

…

tcp_stats.c

…

tcp.c

…

tcp.h

rds: switch ->inc_copy_to_user() to passing iov_iter

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

threads.c

…

transport.c

…