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

Lots of easy overlapping changes in the confict
resolutions here.

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

2018-05-26 19:46:15 -04:00

..

arraymap.c

bpf: btf: Rename btf_key_id and btf_value_id in bpf_map_info

2018-05-23 12:03:32 +02: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: Only set node->ref = 1 if it has not been set

2017-09-01 09:57:39 -07:00

btf.c

bpf: btf: Avoid variable length array

2018-05-24 09:15:11 +02:00

cgroup.c

bpf: Hooks for sys_bind

2018-03-31 02:15:18 +02:00

core.c

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

2018-05-21 16:01:54 -04:00

cpumap.c

xdp: introduce xdp_return_frame_rx_napi

2018-05-24 18:36:15 -07:00

devmap.c

xdp/trace: extend tracepoint in devmap with an err

2018-05-24 18:36:15 -07:00

disasm.c

bpf: Remove struct bpf_verifier_env argument from print_bpf_insn

2018-03-23 17:38:57 +01:00

disasm.h

bpf: Remove struct bpf_verifier_env argument from print_bpf_insn

2018-03-23 17:38:57 +01:00

hashtab.c

bpf: add helper for copying attrs to struct bpf_map

2018-01-14 23:36:29 +01:00

helpers.c

bpf: rename ARG_PTR_TO_STACK

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

inode.c

bpf: remove tracepoints from bpf core

2018-04-30 10:55:56 +02:00

lpm_trie.c

bpf: fix rcu lockdep warning for lpm_trie map_free callback

2018-02-22 21:29:12 +01:00

Makefile

bpf: introduce new bpf AF_XDP map type BPF_MAP_TYPE_XSKMAP

2018-05-03 15:55:24 -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

offload.c

bpf: offload: allow offloaded programs to use perf event arrays

2018-05-04 23:41:03 +02:00

percpu_freelist.c

bpf: fix lockdep splat

2017-11-15 19:46:32 +09:00

percpu_freelist.h

bpf: introduce percpu_freelist

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

sockmap.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next

2018-05-24 22:20:51 -04:00

stackmap.c

bpf: enable stackmap with build_id in nmi context

2018-05-14 23:29:45 +02:00

syscall.c

bpf: introduce bpf subcommand BPF_TASK_FD_QUERY

2018-05-24 18:18:19 -07:00

tnum.c

bpf/verifier: improve register value range tracking with ARSH

2018-04-29 08:45:53 -07:00

verifier.c

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

2018-05-26 19:46:15 -04:00

xskmap.c

xsk: clean up SPDX headers

2018-05-18 16:07:02 +02:00