David S. Miller 0f3e9c97eb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

All of the conflicts were cases of overlapping changes.

In net/core/devlink.c, we have to make care that the
resouce size_params have become a struct member rather
than a pointer to such an object.

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

2018-03-06 01:20:46 -05:00

..

addr.c

tipc: simplify include dependencies

2015-05-14 12:24:45 -04:00

addr.h

tipc: introduce constants for tipc address validation

2016-07-26 14:26:42 -07:00

bcast.c

tipc: fall back to smaller MTU if allocation of local send skb fails

2017-12-01 15:21:25 -05:00

bcast.h

tipc: make replicast a user selectable option

2017-01-20 12:10:17 -05:00

bearer.c

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

2018-02-19 18:46:11 -05:00

bearer.h

tipc: Introduce __tipc_nl_media_set

2018-02-14 14:46:32 -05:00

core.c

netns: make struct pernet_operations::id unsigned int

2016-11-18 10:59:15 -05:00

core.h

tipc: rename tipc_server to tipc_topsrv

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

discover.c

net: tipc: Convert timers to use timer_setup()

2017-11-01 12:38:45 +09:00

discover.h

tipc: eliminate buffer leak in bearer layer

2016-04-07 17:00:13 -04:00

eth_media.c

tipc: make media address offset a common define

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

group.c

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

2018-03-06 01:20:46 -05:00

group.h

tipc: fix race between poll() and setsockopt()

2018-01-19 15:12:21 -05:00

ib_media.c

tipc: rename media/msg related definitions

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

Kconfig

tipc: add ip/udp media type

2015-03-05 22:08:42 -05:00

link.c

tipc: apply bearer link tolerance on running links

2018-02-14 15:22:24 -05:00

link.h

tipc: transfer broadcast nacks in link state messages

2016-09-02 17:10:24 -07:00

Makefile

tipc: rename tipc_server to tipc_topsrv

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

monitor.c

tipc: fix tipc_mon_delete() oops in tipc_enable_bearer() error path

2017-12-27 10:55:00 -05:00

monitor.h

tipc: dump monitor attributes

2016-07-26 14:26:42 -07:00

msg.c

tipc: fix skb truesize/datasize ratio control

2018-02-08 15:30:40 -05:00

msg.h

tipc: fall back to smaller MTU if allocation of local send skb fails

2017-12-01 15:21:25 -05:00

name_distr.c

tipc: allocate user memory with GFP_KERNEL flag

2017-01-16 13:31:53 -05:00

name_distr.h

tipc: reduce code dependency between binding table and node layer

2015-11-20 14:06:10 -05:00

name_table.c

tipc: make struct tipc_server private for server.c

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

name_table.h

tipc: simplify endianness handling in topology subscriber

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

net.c

tipc: Introduce __tipc_nl_net_set

2018-02-14 14:46:33 -05:00

net.h

tipc: Introduce __tipc_nl_net_set

2018-02-14 14:46:33 -05:00

netlink_compat.c

tipc: Fix missing RTNL lock protection during setting link properties

2018-02-14 14:46:33 -05:00

netlink.c

netlink: pass extended ACK struct to parsing functions

2017-04-13 13:58:22 -04:00

netlink.h

tipc: make cluster size threshold for monitoring configurable

2016-07-26 14:26:42 -07:00

node.c

tipc: apply bearer link tolerance on running links

2018-02-14 15:22:24 -05:00

node.h

tipc: apply bearer link tolerance on running links

2018-02-14 15:22:24 -05:00

socket.c

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

2018-03-06 01:20:46 -05:00

socket.h

tipc: redesign connection-level flow control

2016-05-03 15:51:16 -04:00

subscr.c

tipc: rename tipc_server to tipc_topsrv

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

subscr.h

tipc: rename tipc_server to tipc_topsrv

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

sysctl.c

tipc: add name distributor resiliency queue

2014-09-01 17:51:48 -07:00

topsrv.c

tipc: don't call sock_release() in atomic context

2018-02-19 14:38:50 -05:00

topsrv.h

tipc: rename tipc_server to tipc_topsrv

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

udp_media.c

tipc: call tipc_rcv() only if bearer is up in tipc_udp_recv()

2017-12-01 15:14:22 -05:00

udp_media.h

tipc: add UDP remoteip dump to netlink API

2016-08-26 21:38:41 -07:00