David S. Miller 6f6e434aa2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... S390 bpf_jit.S is removed in net-next and had changes in 'net', since that code isn't used any more take the removal. TLS data structures split the TX and RX components in 'net-next', put the new struct members from the bug fix in 'net' into the RX part. The 'net-next' tree had some reworking of how the ERSPAN code works in the GRE tunneling code, overlapping with a one-line headroom calculation fix in 'net'. Overlapping changes in __sock_map_ctx_update_elem(), keep the bits that read the prog members via READ_ONCE() into local variables before using them. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-05-21 16:01:54 -04:00
..
.gitignore	tools lib bpf: Change FEATURE-DUMP to FEATURE-DUMP.libbpf	2015-11-05 12:47:51 -03:00
bpf.c	libbpf: add ifindex to enable offload support	2018-05-17 00:54:26 +02:00
bpf.h	libbpf: add ifindex to enable offload support	2018-05-17 00:54:26 +02:00
btf.c	bpf: btf: Clean up btf.h in uapi	2018-04-23 11:32:01 +02:00
btf.h	bpf: btf: Add BTF support to libbpf	2018-04-19 21:46:25 +02:00
Build	bpf: btf: Add BTF support to libbpf	2018-04-19 21:46:25 +02:00
libbpf.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2018-05-21 16:01:54 -04:00
libbpf.h	libbpf: add ifindex to enable offload support	2018-05-17 00:54:26 +02:00
Makefile	tools: bpf: move the event reading loop to libbpf	2018-05-11 01:40:52 +02:00
nlattr.c	libbpf: add error reporting in XDP	2018-02-02 17:53:48 -08:00
nlattr.h	libbpf: add error reporting in XDP	2018-02-02 17:53:48 -08:00