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

Conflicts:
	drivers/net/phy/bcm7xxx.c
	drivers/net/phy/marvell.c
	drivers/net/vxlan.c

All three conflicts were cases of simple overlapping changes.

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

2016-02-23 00:09:14 -05:00

..

arraymap.c

bpf: add lookup/update support for per-cpu hash and array maps

2016-02-06 03:34:36 -05:00

core.c

bpf: move clearing of A/X into classic to eBPF migration prologue

2015-12-18 16:04:51 -05:00

hashtab.c

bpf: grab rcu read lock for bpf_percpu_hash_update

2016-02-19 14:37:43 -05:00

helpers.c

bpf: split state from prandom_u32() and consolidate {c, e}BPF prngs

2015-10-08 05:26:39 -07:00

inode.c

bpf, inode: allow for rename and link ops

2015-12-12 18:44:23 -05:00

Makefile

bpf: introduce BPF_MAP_TYPE_STACK_TRACE

2016-02-20 00:21:44 -05:00

stackmap.c

bpf: introduce BPF_MAP_TYPE_STACK_TRACE

2016-02-20 00:21:44 -05:00

syscall.c

bpf: add lookup/update support for per-cpu hash and array maps

2016-02-06 03:34:36 -05:00

verifier.c

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

2016-02-23 00:09:14 -05:00