David S. Miller 70f3522614 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Three conflicts, one of which, for marvell10g.c is non-trivial and
requires some follow-up from Heiner or someone else.

The issue is that Heiner converted the marvell10g driver over to
use the generic c45 code as much as possible.

However, in 'net' a bug fix appeared which makes sure that a new
local mask (MDIO_AN_10GBT_CTRL_ADV_NBT_MASK) with value 0x01e0
is cleared.

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

2019-02-24 12:06:19 -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: 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

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

tipc: make media address offset a common define

2015-02-27 18:18:48 -05:00

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

tipc: rename media/msg related definitions

2015-02-27 18:18:48 -05:00

Kconfig

tipc: implement socket diagnostics for AF_TIPC

2018-03-22 14:43:35 -04:00

link.c

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

2019-02-15 12:38:38 -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: fix link session and re-establish issues

2019-02-11 21:26:20 -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_compat.c

tipc: fix uninit-value in tipc_nl_compat_doit

2019-01-15 20:29:21 -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

node.c

tipc: fix link session and re-establish issues

2019-02-11 21:26:20 -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

2019-02-24 12:06:19 -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

tipc: remove dead code in struct tipc_topsrv

2019-01-24 22:31:23 -08:00

topsrv.h

tipc: rename tipc_server to tipc_topsrv

2018-02-16 15:26:34 -05:00

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: 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