David S. Miller 30d0844bdc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/mellanox/mlx5/core/en.h
	drivers/net/ethernet/mellanox/mlx5/core/en_main.c
	drivers/net/usb/r8152.c

All three conflicts were overlapping changes.

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

2016-07-06 10:35:22 -07:00

..

addr.c

tipc: simplify include dependencies

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

addr.h

tipc: add neighbor monitoring framework

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

bcast.c

tipc: remove pre-allocated message header in link struct

2016-03-06 23:01:20 -05:00

bcast.h

tipc: remove pre-allocated message header in link struct

2016-03-06 23:01:20 -05:00

bearer.c

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

2016-06-30 05:03:36 -04:00

bearer.h

tipc: add neighbor monitoring framework

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

core.c

tipc: add neighbor monitoring framework

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

core.h

tipc: add neighbor monitoring framework

2016-06-15 14:06:28 -07: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

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

2016-06-30 05:03:36 -04:00

link.h

tipc: let first message on link be a state message

2016-04-15 16:09:06 -04:00

Makefile

tipc: add neighbor monitoring framework

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

monitor.c

tipc: potential shift wrapping bug in map_set()

2016-06-17 21:26:03 -07:00

monitor.h

tipc: add neighbor monitoring framework

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

msg.c

tipc: unclone unbundled buffers before forwarding

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

msg.h

tipc: unclone unbundled buffers before forwarding

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

name_distr.c

tipc: purge deferred updates from dead nodes

2016-04-11 15:22:20 -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: make tipc node table aware of net namespace

2015-01-12 16:24:32 -05:00

netlink_compat.c

tipc: fix nl compat regression for link statistics

2016-07-01 16:47:38 -04:00

netlink.c

tipc: move netlink policies to netlink.c

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

netlink.h

tipc: move netlink policies to netlink.c

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

node.c

tipc: add neighbor monitoring framework

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

node.h

tipc: redesign connection-level flow control

2016-05-03 15:51:16 -04: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

tipc: fix socket timer deadlock

2016-06-17 21:38:10 -07: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: rename udp_port in struct udp_media_addr

2016-06-29 05:17:37 -04:00