David S. Miller b04096ff33 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Four minor merge conflicts: 1) qca_spi.c renamed the local variable used for the SPI device from spi_device to spi, meanwhile the spi_set_drvdata() call got moved further up in the probe function. 2) Two changes were both adding new members to codel params structure, and thus we had overlapping changes to the initializer function. 3) 'net' was making a fix to sk_release_kernel() which is completely removed in 'net-next'. 4) In net_namespace.c, the rtnl_net_fill() call for GET operations had the command value fixed, meanwhile 'net-next' adjusted the argument signature a bit. This also matches example merge resolutions posted by Stephen Rothwell over the past two days. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-05-13 14:31:43 -04:00
..
Kconfig	net/rds: remove depends on CONFIG_EXPERIMENTAL	2013-01-11 11:40:02 -08:00
Makefile	Net: rds: Makefile: Remove deprecated items	2010-11-22 08:16:15 -08:00
af_rds.c	net: Pass kern from net_proto_family.create to sk_alloc	2015-05-11 10:50:17 -04:00
bind.c	net: replace macros net_random and net_srandom with direct calls to prandom	2014-01-14 15:15:25 -08: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	net/rds: RDS-TCP: only initiate reconnect attempt on outgoing TCP socket.	2015-05-09 16:03:28 -04:00
ib.c	rds: prevent dereference of a NULL device	2013-12-27 12:33:58 -05:00
ib.h	rds: switch ->inc_copy_to_user() to passing iov_iter	2014-11-24 05:16:43 -05:00
ib_cm.c	net/rds: Fix new sparse warning	2015-05-04 15:23:06 -04:00
ib_rdma.c	net: Replace get_cpu_var through this_cpu_ptr	2014-08-26 13:45:47 -04:00
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	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
info.c	rds: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:28 +08:00
info.h	…
iw.c	rds: prevent dereference of a NULL device in rds_iw_laddr_check	2014-03-31 16:25:52 -04:00
iw.h	rds: switch ->inc_copy_to_user() to passing iov_iter	2014-11-24 05:16:43 -05:00
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	rds: remove the unneed NULL checking	2014-05-09 15:59:45 -04:00
loop.c	RDS: use gfp flags from caller in conn_alloc()	2012-03-22 19:29:58 -04:00
loop.h	…
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.c	rds: avoid calling sock_kfree_s() on allocation failure	2014-10-14 17:00:19 -04:00
rdma_transport.c	RDS/RDMA: Replace comma with semicolon	2014-05-30 17:48:58 -07:00
rdma_transport.h	rds: make local functions/variables static	2010-10-21 04:26:39 -07:00
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	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.c	net: Fix files explicitly needing to include module.h	2011-10-31 19:30:28 -04:00
tcp.h	rds: switch ->inc_copy_to_user() to passing iov_iter	2014-11-24 05:16:43 -05:00
tcp_connect.c	net/rds: RDS-TCP: Always create a new rds_sock for an incoming connection.	2015-05-09 16:03:27 -04:00
tcp_listen.c	net/rds: RDS-TCP: Always create a new rds_sock for an incoming connection.	2015-05-09 16:03:27 -04: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
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: have sockets get transport module references	2010-09-08 18:16:47 -07:00