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

udplite conflict is resolved by taking what 'net-next' did
which removed the backlog receive method assignment, since
it is no longer necessary.

Two entries were added to the non-priv ethtool operations
switch statement, one in 'net' and one in 'net-next, so
simple overlapping changes.

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

2016-11-26 23:42:21 -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: fix broadcast link synchronization problem

2016-10-29 17:21:09 -04:00

bcast.h

tipc: fix broadcast link synchronization problem

2016-10-29 17:21:09 -04:00

bearer.c

tipc: add the ability to get UDP options via netlink

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

bearer.h

tipc: introduce UDP replicast

2016-08-26 21:38:41 -07: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: honor msg2addr return value

2016-06-29 05:17:37 -04: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

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: fix compatibility bug in link monitoring

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

link.h

tipc: transfer broadcast nacks in link state messages

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

Makefile

tipc: add neighbor monitoring framework

2016-06-15 14:06:28 -07:00

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: unclone unbundled buffers before forwarding

2016-06-22 16:33:35 -04:00

msg.h

tipc: rename struct tipc_skb_cb member handle to bytes_read

2016-11-01 11:53:23 -04:00

name_distr.c

tipc: fix broadcast link synchronization problem

2016-10-29 17:21:09 -04: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: move netlink policies to netlink.c

2016-03-07 14:56:41 -05:00

name_table.h

tipc: convert legacy nl name table dump to nl compat

2015-02-09 13:20:48 -08:00

net.c

tipc: move netlink policies to netlink.c

2016-03-07 14:56:41 -05:00

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

tipc: fix broadcast link synchronization problem

2016-10-29 17:21:09 -04:00

node.h

tipc: transfer broadcast nacks in link state messages

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

server.c

tipc: Use kmemdup instead of kmalloc and memcpy

2016-06-27 09:56:58 -04:00

server.h

tipc: fix a race condition leading to subscriber refcnt bug

2016-04-14 16:46:46 -04:00

socket.c

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

2016-11-26 23:42:21 -05:00

socket.h

tipc: redesign connection-level flow control

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

subscr.c

tipc: remove an unnecessary NULL check

2016-04-28 16:54:12 -04:00

subscr.h

tipc: remove struct tipc_name_seq from struct tipc_subscription

2016-02-06 03:40:43 -05:00

sysctl.c

tipc: add name distributor resiliency queue

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

udp_media.c

tipc: info leak in __tipc_nl_add_udp_addr()

2016-10-13 12:10:01 -04:00

udp_media.h

tipc: add UDP remoteip dump to netlink API

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