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

..

arraymap.c

bpf: don't trigger OOM killer under pressure with map alloc

2017-01-18 17:12:26 -05:00

bpf_lru_list.c

bpf: Make unnecessarily global functions static

2017-01-10 21:00:59 -05:00

bpf_lru_list.h

bpf: Add percpu LRU list

2016-11-15 11:50:20 -05:00

cgroup.c

bpf: Add new cgroup attach type to enable sock modifications

2016-12-02 13:46:08 -05:00

core.c

bpf: add initial bpf tracepoints

2017-01-25 13:17:47 -05:00

hashtab.c

bpf: don't trigger OOM killer under pressure with map alloc

2017-01-18 17:12:26 -05:00

helpers.c

bpf: rename ARG_PTR_TO_STACK

2017-01-09 16:56:27 -05:00

inode.c

bpf: add initial bpf tracepoints

2017-01-25 13:17:47 -05:00

lpm_trie.c

bpf, lpm: fix kfree of im_node in trie_update_elem

2017-01-23 21:17:35 -05:00

Makefile

bpf: add a longest prefix match trie map implementation

2017-01-23 16:10:38 -05:00

percpu_freelist.c

…

percpu_freelist.h

…

stackmap.c

bpf: don't trigger OOM killer under pressure with map alloc

2017-01-18 17:12:26 -05:00

syscall.c

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

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

verifier.c

bpf: enable verifier to better track const alu ops

2017-01-24 14:46:06 -05:00