David S. Miller 13dfb3fa49 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ...

Just minor overlapping changes in the conflicts here.

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

2019-08-06 18:44:57 -07:00

..

addr.c

…

addr.h

…

bcast.c

tipc: rename function msg_get_wrapped() to msg_inner_hdr()

2019-06-25 13:42:54 -07:00

bcast.h

tipc: fix a null pointer deref

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

bearer.c

tipc: use rcu dereference functions properly

2019-07-07 13:18:53 -07:00

bearer.h

tipc: enable tracepoints in tipc

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

core.c

tipc: change to use register_pernet_device

2019-06-22 16:51:47 -07:00

core.h

tipc: introduce new capability flag for cluster

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

diag.c

…

discover.c

…

discover.h

…

eth_media.c

…

group.c

tipc: purge deferredq list for each grp member in tipc_group_delete

2019-06-16 20:42:05 -07:00

group.h

…

ib_media.c

…

Kconfig

docs: kbuild: convert docs to ReST and rename to *.rst

2019-06-14 14:21:21 -06:00

link.c

tipc: reduce risk of wakeup queue starvation

2019-08-01 18:19:28 -04:00

link.h

tipc: fix missing Name entries due to half-failover

2019-05-04 00:59:51 -04:00

Makefile

tipc: enable tracepoints in tipc

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

monitor.c

netlink: make nla_nest_start() add NLA_F_NESTED flag

2019-04-27 17:03:44 -04:00

monitor.h

…

msg.c

tipc: fix changeover issues due to large packet

2019-07-25 15:55:47 -07:00

msg.h

tipc: fix changeover issues due to large packet

2019-07-25 15:55:47 -07:00

name_distr.c

tipc: ensure head->lock is initialised

2019-07-12 15:34:26 -07:00

name_distr.h

…

name_table.c

netlink: make nla_nest_start() add NLA_F_NESTED flag

2019-04-27 17:03:44 -04:00

name_table.h

…

net.c

netlink: make validation more configurable for future strictness

2019-04-27 17:07:21 -04:00

net.h

…

netlink_compat.c

tipc: compat: allow tipc commands without arguments

2019-08-01 18:14:00 -04:00

netlink.c

tipc: fix missing indentation in source code

2019-06-24 07:29:45 -07:00

netlink.h

…

node.c

tipc: optimize link synching mechanism

2019-07-25 15:55:47 -07:00

node.h

tipc: optimize link synching mechanism

2019-07-25 15:55:47 -07:00

socket.c

tipc: fix unitilized skb list crash

2019-07-30 14:39:36 -07:00

socket.h

tipc: add trace_events for tipc socket

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

subscr.c

…

subscr.h

tipc: fix modprobe tipc failed after switch order of device registration

2019-05-20 10:45:43 -07:00

sysctl.c

proc/sysctl: add shared variables for range check

2019-07-18 17:08:07 -07:00

topsrv.c

tipc: Fix a typo

2019-07-21 11:41:01 -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

tipc: use rcu dereference functions properly

2019-07-07 13:18:53 -07:00

udp_media.h

…