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

Two minor conflicts in virtio_net driver (bug fix overlapping addition
of a helper) and MAINTAINERS (new driver edit overlapping revamp of
PHY entry).

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

2017-08-01 10:07:50 -07:00

..

arraymap.c

bpf: Add syscall lookup support for fd array and htab

2017-06-29 13:13:25 -04:00

bpf_lru_list.c

bpf: lru: Lower the PERCPU_NR_SCANS from 16 to 4

2017-04-17 13:55:52 -04:00

bpf_lru_list.h

bpf: Add percpu LRU list

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

cgroup.c

bpf: BPF support for sock_ops

2017-07-01 16:15:13 -07:00

core.c

bpf: Fix out-of-bound access on interpreters[]

2017-06-29 15:37:04 -04:00

devmap.c

bpf: dev_map_alloc() shouldn't return NULL

2017-07-24 16:23:05 -07:00

hashtab.c

bpf: Add syscall lookup support for fd array and htab

2017-06-29 13:13:25 -04:00

helpers.c

bpf: rename ARG_PTR_TO_STACK

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

inode.c

bpf: Implement show_options

2017-07-06 03:31:46 -04:00

lpm_trie.c

bpf: fix wrong exposure of map_flags into fdinfo for lpm

2017-05-25 13:44:28 -04:00

Makefile

bpf: add devmap, a map for storing net device references

2017-07-17 09:48:06 -07:00

map_in_map.c

bpf: Add syscall lookup support for fd array and htab

2017-06-29 13:13:25 -04:00

map_in_map.h

bpf: Add syscall lookup support for fd array and htab

2017-06-29 13:13:25 -04:00

percpu_freelist.c

bpf: introduce percpu_freelist

2016-03-08 15:28:31 -05:00

percpu_freelist.h

bpf: introduce percpu_freelist

2016-03-08 15:28:31 -05:00

stackmap.c

bpf: fix wrong exposure of map_flags into fdinfo for lpm

2017-05-25 13:44:28 -04:00

syscall.c

bpf: fix bpf_prog_get_info_by_fd to dump correct xlated_prog_len

2017-07-29 23:29:41 -07:00

verifier.c

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

2017-08-01 10:07:50 -07:00