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

Conflicts:
	drivers/net/ethernet/renesas/ravb_main.c
	kernel/bpf/syscall.c
	net/ipv4/ipmr.c

All three conflicts were cases of overlapping changes.

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

2015-12-03 21:09:12 -05:00

..

addr.c

tipc: simplify include dependencies

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

addr.h

tipc: simplify include dependencies

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

bcast.c

tipc: narrow down interface towards struct tipc_link

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

bcast.h

tipc: narrow down exposure of struct tipc_node

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

bearer.c

tipc: eliminate remnants of hungarian notation

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

bearer.h

tipc: eliminate remnants of hungarian notation

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

core.c

tipc: create broadcast transmission link at namespace init

2015-10-24 06:56:27 -07:00

core.h

tipc: reduce code dependency between binding table and node layer

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

discover.c

tipc: eliminate remnants of hungarian notation

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

discover.h

tipc: involve namespace infrastructure

2015-01-12 16:24:32 -05: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

2015-12-03 21:09:12 -05:00

link.h

tipc: eliminate remnants of hungarian notation

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

Makefile

tipc: add ip/udp media type

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

msg.c

tipc: let broadcast packet reception use new link receive function

2015-10-24 06:56:37 -07:00

msg.h

tipc: let broadcast packet reception use new link receive function

2015-10-24 06:56:37 -07:00

name_distr.c

tipc: reduce code dependency between binding table and node layer

2015-11-20 14:06:10 -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: reduce code dependency between binding table and node layer

2015-11-20 14:06:10 -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: create broadcast transmission link at namespace init

2015-10-24 06:56:27 -07:00

net.h

tipc: make tipc node table aware of net namespace

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

netlink_compat.c

tipc: narrow down interface towards struct tipc_link

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

netlink.c

tipc: narrow down interface towards struct tipc_link

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

netlink.h

tipc: move and rename the legacy nl api to "nl compat"

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

node.c

tipc: fix node reference count bug

2015-12-03 15:19:40 -05:00

node.h

tipc: narrow down interface towards struct tipc_link

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

server.c

tipc: use sock_create_kern interface to create kernel socket

2015-05-14 13:39:33 -04:00

server.h

tipc: make subscriber server support net namespace

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

socket.c

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

2015-12-03 21:09:12 -05:00

socket.h

tipc: clean up socket layer message reception

2015-07-26 16:31:50 -07:00

subscr.c

tipc: adjust locking policy of subscription

2015-05-04 15:04:01 -04:00

subscr.h

tipc: rename functions defined in subscr.c

2015-05-04 15:04:00 -04:00

sysctl.c

…

udp_media.c

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

2015-12-03 21:09:12 -05:00