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

Minor overlapping changes in the conflicts.

In the macsec case, the change of the default ID macro
name overlapped with the 64-bit netlink attribute alignment
fixes in net-next.

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

2016-04-27 15:43:10 -04:00

..

arraymap.c

bpf: check for reserved flag bits in array and stack maps

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

core.c

bpf: add event output helper for notifications/sampling/logging

2016-04-19 20:26:11 -04:00

hashtab.c

bpf: pre-allocate hash map elements

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

helpers.c

bpf: convert relevant helper args to ARG_PTR_TO_RAW_STACK

2016-04-14 21:40:41 -04:00

inode.c

bpf, inode: allow for rename and link ops

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

Makefile

bpf: introduce percpu_freelist

2016-03-08 15:28:31 -05: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: support bpf_get_stackid() and bpf_perf_event_output() in tracepoint programs

2016-04-07 21:04:26 -04:00

syscall.c

bpf: add missing map_flags to bpf_map_show_fdinfo

2016-03-25 11:36:41 -04:00

verifier.c

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

2016-04-27 15:43:10 -04:00