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_list.h

…

btf.c

bpf: btf: Avoid variable length array

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

cgroup.c

…

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

…

disasm.h

…

hashtab.c

…

helpers.c

…

inode.c

…

lpm_trie.c

…

Makefile

…

map_in_map.c

…

map_in_map.h

…

offload.c

…

percpu_freelist.c

…

percpu_freelist.h

…

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

…

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