David S. Miller 4e8f2fc1a5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Two trivial overlapping changes conflicts in MPLS and mlx5.

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

2017-01-28 10:33:06 -05:00

..

addr.c

…

addr.h

…

bcast.c

tipc: make replicast a user selectable option

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

bcast.h

tipc: make replicast a user selectable option

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

bearer.c

tipc: add function for checking broadcast support in bearer

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

bearer.h

tipc: add function for checking broadcast support in bearer

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

core.c

netns: make struct pernet_operations::id unsigned int

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

core.h

netns: make struct pernet_operations::id unsigned int

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

discover.c

tipc: allocate user memory with GFP_KERNEL flag

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

discover.h

…

eth_media.c

…

ib_media.c

…

Kconfig

…

link.c

tipc: make replicast a user selectable option

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

link.h

tipc: transfer broadcast nacks in link state messages

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

Makefile

…

monitor.c

tipc: improve sanity check for received domain records

2016-11-25 20:06:18 -05:00

monitor.h

tipc: dump monitor attributes

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

msg.c

tipc: introduce replicast as transport option for multicast

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

msg.h

tipc: introduce replicast as transport option for multicast

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

name_distr.c

tipc: allocate user memory with GFP_KERNEL flag

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

name_distr.h

…

name_table.c

tipc: add functionality to lookup multicast destination nodes

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

name_table.h

tipc: add functionality to lookup multicast destination nodes

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

net.c

…

net.h

tipc: add peer removal functionality

2016-08-18 23:36:07 -07:00

netlink_compat.c

genetlink: mark families as __ro_after_init

2016-10-27 16:16:09 -04:00

netlink.c

genetlink: mark families as __ro_after_init

2016-10-27 16:16:09 -04:00

netlink.h

tipc: make cluster size threshold for monitoring configurable

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

node.c

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

2017-01-28 10:33:06 -05:00

node.h

tipc: make replicast a user selectable option

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

server.c

tipc: fix cleanup at module unload

2017-01-24 16:14:58 -05:00

server.h

…

socket.c

tipc: uninitialized return code in tipc_setsockopt()

2017-01-25 12:41:34 -05:00

socket.h

…

subscr.c

tipc: add subscription refcount to avoid invalid delete

2017-01-24 16:14:57 -05:00

subscr.h

tipc: add subscription refcount to avoid invalid delete

2017-01-24 16:14:57 -05:00

sysctl.c

…

udp_media.c

tipc: add function for checking broadcast support in bearer

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

udp_media.h

tipc: add UDP remoteip dump to netlink API

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