David S. Miller 0fa74a4be4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/emulex/benet/be_main.c net/core/sysctl_net_core.c net/ipv4/inet_diag.c The be_main.c conflict resolution was really tricky. The conflict hunks generated by GIT were very unhelpful, to say the least. It split functions in half and moved them around, when the real actual conflict only existed solely inside of one function, that being be_map_pci_bars(). So instead, to resolve this, I checked out be_main.c from the top of net-next, then I applied the be_main.c changes from 'net' since the last time I merged. And this worked beautifully. The inet_diag.c and sysctl_net_core.c conflicts were simple overlapping changes, and were easily to resolve. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-03-20 18:51:09 -04:00
..
af_rds.c	treewide: fix synchronize_rcu() in comments	2014-08-28 15:01:24 +02: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	inet: convert inet_ehash_secret and ipv6_hash_secret to net_get_random_once	2013-10-19 19:45:35 -04:00
ib_cm.c	IB/rds: suppress incompatible protocol when version is known	2012-12-26 15:17:37 -08: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	RDS/IW+IB: Set recv ring low water mark to 1/2 full.	2009-04-09 17:21:14 -07:00
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
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
info.c	rds: remove the second argument of k[un]map_atomic()	2012-03-20 21:48:28 +08:00
info.h	RDS: Info and stats	2009-02-26 23:39:25 -08: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	RDS/IW+IB: Set recv ring low water mark to 1/2 full.	2009-04-09 17:21:14 -07:00
iw_send.c	net: rds: Remove repeated function names from debug output	2015-02-07 22:41:56 -08: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: 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
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/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
rdma.c	rds: avoid calling sock_kfree_s() on allocation failure	2014-10-14 17:00:19 -04:00
rds.h	net: Remove iocb argument from sendmsg and recvmsg	2015-03-02 13:06:31 -05:00
recv.c	net: Remove iocb argument from sendmsg and recvmsg	2015-03-02 13:06:31 -05:00
send.c	net: Remove iocb argument from sendmsg and recvmsg	2015-03-02 13:06:31 -05: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	net/rds: do proper house keeping if connection fails in rds_tcp_conn_connect	2014-10-03 12:51:59 -07:00
tcp_listen.c	rds/tcp_listen: Replace comma with semicolon	2014-05-30 17:48: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	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
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