David S. Miller 2be09de7d6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Lots of conflicts, by happily all cases of overlapping changes, parallel adds, things of that nature. Thanks to Stephen Rothwell, Saeed Mahameed, and others for their guidance in these resolutions. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-12-20 11:53:36 -08:00
..
addr.c	tipc: handle collisions of 32-bit node address hash values	2018-03-23 13:12:18 -04:00
addr.h	tipc: add 128-bit node identifier	2018-03-23 13:12:18 -04:00
bcast.c	tipc: correct spelling errors for struct tipc_bc_base's comment	2018-09-03 22:03:07 -07:00
bcast.h	tipc: make replicast a user selectable option	2017-01-20 12:10:17 -05:00
bearer.c	tipc: add trace_events for tipc bearer	2018-12-19 11:49:25 -08:00
bearer.h	tipc: enable tracepoints in tipc	2018-12-19 11:49:24 -08:00
core.c	net: Drop pernet_operations::async	2018-03-27 13:18:09 -04:00
core.h	tipc: replace name table service range array with rb tree	2018-03-31 22:19:52 -04:00
diag.c	tipc: switch to rhashtable iterator	2018-08-29 18:04:54 -07:00
discover.c	tipc: fix lockdep warning when reinitilaizing sockets	2018-11-17 22:01:31 -08:00
discover.h	tipc: some cleanups in the file discover.c	2018-03-23 13:12:17 -04:00
eth_media.c
group.c	tipc: fix info leak from kernel tipc_event	2018-10-18 16:49:53 -07:00
group.h	tipc: extend sock diag for group communication	2018-06-30 21:05:42 +09:00
ib_media.c
Kconfig	tipc: implement socket diagnostics for AF_TIPC	2018-03-22 14:43:35 -04:00
link.c	tipc: fix uninitialized value for broadcast retransmission	2018-12-19 11:53:10 -08:00
link.h	tipc: add trace_events for tipc link	2018-12-19 11:49:24 -08:00
Makefile	tipc: enable tracepoints in tipc	2018-12-19 11:49:24 -08:00
monitor.c	tipc: make some functions static	2018-07-21 16:23:22 -07:00
monitor.h	tipc: dump monitor attributes	2016-07-26 14:26:42 -07:00
msg.c	tipc: buffer overflow handling in listener socket	2018-09-29 11:24:22 -07:00
msg.h	tipc: improve broadcast retransmission algorithm	2018-11-11 09:57:46 -08:00
name_distr.c	tipc: eliminate message disordering during binding table update	2018-10-22 19:29:12 -07:00
name_distr.h	tipc: permit overlapping service ranges in name table	2018-03-31 22:19:52 -04:00
name_table.c	tipc: eliminate message disordering during binding table update	2018-10-22 19:29:12 -07:00
name_table.h	tipc: eliminate message disordering during binding table update	2018-10-22 19:29:12 -07:00
net.c	tipc: fix lockdep warning when reinitilaizing sockets	2018-11-17 22:01:31 -08:00
net.h	tipc: fix lockdep warning when reinitilaizing sockets	2018-11-17 22:01:31 -08:00
netlink.c	tipc: switch to rhashtable iterator	2018-08-29 18:04:54 -07:00
netlink.h	tipc: make cluster size threshold for monitoring configurable	2016-07-26 14:26:42 -07:00
netlink_compat.c	tipc: check return value of __tipc_dump_start()	2018-09-12 13:15:04 -07:00
node.c	tipc: add trace_events for tipc node	2018-12-19 11:49:24 -08:00
node.h	tipc: enable tracepoints in tipc	2018-12-19 11:49:24 -08:00
socket.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-12-20 11:53:36 -08:00
socket.h	tipc: add trace_events for tipc socket	2018-12-19 11:49:24 -08:00
subscr.c	tipc: fix unbalanced reference counter	2018-04-12 21:46:10 -04:00
subscr.h	tipc: replace name table service range array with rb tree	2018-03-31 22:19:52 -04:00
sysctl.c	tipc: add trace_events for tipc socket	2018-12-19 11:49:24 -08:00
topsrv.c	Merge branch 'work.afs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2018-11-01 19:58:52 -07:00
topsrv.h	tipc: rename tipc_server to tipc_topsrv	2018-02-16 15:26:34 -05:00
trace.c	tipc: add trace_events for tipc socket	2018-12-19 11:49:24 -08:00
trace.h	tipc: add trace_events for tipc bearer	2018-12-19 11:49:25 -08:00
udp_media.c	tipc: compare remote and local protocols in tipc_udp_enable()	2018-12-14 13:28:03 -08:00
udp_media.h	tipc: implement configuration of UDP media MTU	2018-04-20 11:04:05 -04:00