David S. Miller 6b0a7f84ea Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflict resolution of af_smc.c from Stephen Rothwell.

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

2019-04-17 11:26:25 -07:00

..

addr.c

…

addr.h

…

bcast.c

tipc: add NULL pointer check

2019-04-04 17:34:11 -07:00

bcast.h

tipc: fix a null pointer deref

2019-03-21 09:56:55 -07:00

bearer.c

tipc: fix a double free in tipc_enable_bearer()

2018-12-27 16:16:17 -08:00

bearer.h

tipc: enable tracepoints in tipc

2018-12-19 11:49:24 -08:00

core.c

tipc: introduce new capability flag for cluster

2019-03-19 13:56:17 -07:00

core.h

tipc: introduce new capability flag for cluster

2019-03-19 13:56:17 -07:00

diag.c

…

discover.c

tipc: fix lockdep warning when reinitilaizing sockets

2018-11-17 22:01:31 -08:00

discover.h

…

eth_media.c

…

group.c

net: tipc: fix a missing check of nla_nest_start

2019-03-16 12:09:05 -07:00

group.h

…

ib_media.c

…

Kconfig

…

link.c

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

2019-04-17 11:26:25 -07: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

…

monitor.h

…

msg.c

tipc: buffer overflow handling in listener socket

2018-09-29 11:24:22 -07:00

msg.h

tipc: reduce duplicate packets for unicast traffic

2019-04-04 18:29:25 -07:00

name_distr.c

tipc: eliminate message disordering during binding table update

2018-10-22 19:29:12 -07:00

name_distr.h

…

name_table.c

tipc: missing entries in name table of publications

2019-04-10 22:58:09 -07:00

name_table.h

tipc: eliminate message disordering during binding table update

2018-10-22 19:29:12 -07:00

net.c

tipc: change to check tipc_own_id to return in tipc_net_stop

2019-03-26 11:21:20 -07:00

net.h

tipc: fix lockdep warning when reinitilaizing sockets

2018-11-17 22:01:31 -08:00

netlink_compat.c

tipc: handle the err returned from cmd header function

2019-03-31 16:45:57 -07:00

netlink.c

genetlink: make policy common to family

2019-03-22 10:38:23 -04:00

netlink.h

…

node.c

tipc: use standard write_lock & unlock functions when creating node

2019-04-11 13:42:35 -07:00

node.h

tipc: improve TIPC throughput by Gap ACK blocks

2019-04-04 18:29:25 -07:00

socket.c

tipc: fix a null pointer deref

2019-03-21 09:56:55 -07:00

socket.h

tipc: add trace_events for tipc socket

2018-12-19 11:49:24 -08:00

subscr.c

…

subscr.h

…

sysctl.c

tipc: set sysctl_tipc_rmem and named_timeout right range

2019-04-16 21:32:02 -07:00

topsrv.c

tipc: fix cancellation of topology subscriptions

2019-03-21 09:09:04 -07:00

topsrv.h

…

trace.c

tipc: remove unneeded semicolon in trace.c

2019-01-17 22:04:43 -08:00

trace.h

tipc: add trace_events for tipc bearer

2018-12-19 11:49:25 -08:00

udp_media.c

ipv6: Move ipv6 stubs to a separate header file

2019-03-29 10:53:45 -07:00

udp_media.h

…