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

All of the conflicts were cases of overlapping changes.

In net/core/devlink.c, we have to make care that the
resouce size_params have become a struct member rather
than a pointer to such an object.

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

2018-03-06 01:20:46 -05:00

..

gnu

selftests/bpf: get rid of -D__x86_64__

2017-05-03 09:51:25 -04:00

include/uapi/linux

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

.gitignore

selftests/bpf: update gitignore with test_libbpf_open

2018-02-22 01:41:18 +01:00

bpf_endian.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

bpf_helpers.h

bpf: add selftest for tcpbpf

2018-01-25 16:41:15 -08:00

bpf_rlimit.h

bpf: unify rlimit handling in selftests

2018-02-26 20:11:23 -08:00

bpf_util.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

cgroup_helpers.c

bpf: move cgroup_helpers from samples/bpf/ to tools/testing/selftesting/bpf/

2017-11-05 23:26:51 +09:00

cgroup_helpers.h

bpf: move cgroup_helpers from samples/bpf/ to tools/testing/selftesting/bpf/

2017-11-05 23:26:51 +09:00

config

selftests/bpf: add netdevsim to config

2017-12-19 01:35:12 +01:00

dev_cgroup.c

selftests/bpf: add a test for device cgroup controller

2017-11-05 23:26:51 +09:00

Makefile

selftests/bpf: fix Makefile for cgroup_helpers.c

2018-02-13 17:59:06 -08:00

sample_map_ret0.c

selftest/bpf: extend the offload test with map checks

2018-01-18 22:54:26 +01:00

sample_ret0.c

selftests/bpf: add offload test based on netdevsim

2017-12-03 00:27:58 +01:00

sockmap_parse_prog.c

selftests/bpf: remove useless bpf_trace_printk

2017-11-01 12:06:46 +09:00

sockmap_verdict_prog.c

selftests/bpf: remove useless bpf_trace_printk

2017-11-01 12:06:46 +09:00

tcp_client.py

bpf: add selftest for tcpbpf

2018-01-25 16:41:15 -08:00

tcp_server.py

bpf: add selftest for tcpbpf

2018-01-25 16:41:15 -08:00

test_align.c

bpf: unify rlimit handling in selftests

2018-02-26 20:11:23 -08:00

test_dev_cgroup.c

bpf: unify rlimit handling in selftests

2018-02-26 20:11:23 -08:00

test_iptunnel_common.h

selftests/bpf: add a test for basic XDP functionality

2017-04-01 12:45:57 -07:00

test_kmod.sh

selftests: bpf: test_kmod.sh: check the module path before insmod

2018-02-08 00:24:55 +01:00

test_l4lb_noinline.c

selftests/bpf: add bpf_call test

2017-12-17 20:34:36 +01:00

test_l4lb.c

bpf: Move endianness BPF helpers out of bpf_util.h

2017-05-01 12:43:49 -07:00

test_libbpf_open.c

selftests/bpf: add test program for loading BPF ELF files

2018-02-09 00:24:38 +01:00

test_libbpf.sh

selftests/bpf: add selftest that use test_libbpf_open

2018-02-09 00:25:12 +01:00

test_lpm_map.c

bpf: unify rlimit handling in selftests

2018-02-26 20:11:23 -08:00

test_lru_map.c

bpf: unify rlimit handling in selftests

2018-02-26 20:11:23 -08:00

test_maps.c

bpf: unify rlimit handling in selftests

2018-02-26 20:11:23 -08:00

test_obj_id.c

bpf: Fix test_obj_id.c for llvm 5.0

2017-06-09 15:15:11 -04:00

test_offload.py

selftests/bpf: check for chain-non-0 extack message

2018-01-25 21:23:09 -05:00

test_pkt_access.c

selftests/bpf: fix broken build due to types.h

2017-05-17 18:45:14 -04:00

test_pkt_md_access.c

bpf: fix selftest/bpf/test_pkt_md_access on s390x

2017-08-07 10:06:27 -07:00

test_progs.c

bpf: unify rlimit handling in selftests

2018-02-26 20:11:23 -08:00

test_stacktrace_map.c

tools/bpf: add a bpf selftest for stacktrace

2018-01-06 23:52:23 +01:00

test_tag.c

bpf: unify rlimit handling in selftests

2018-02-26 20:11:23 -08:00

test_tcp_estats.c

selftests/bpf: add a test case to check verifier pointer arithmetic

2017-05-03 09:51:25 -04:00

test_tcpbpf_kern.c

selftests/bpf: tcpbpf_kern: use in6_* macros from glibc

2018-02-22 01:19:37 +01:00

test_tcpbpf_user.c

bpf: unify rlimit handling in selftests

2018-02-26 20:11:23 -08:00

test_tcpbpf.h

bpf: add selftest for tcpbpf

2018-01-25 16:41:15 -08:00

test_tracepoint.c

bpf/tracing: add a bpf test for new ioctl query interface

2017-12-12 08:46:40 -08:00

test_verifier_log.c

bpf: unify rlimit handling in selftests

2018-02-26 20:11:23 -08:00

test_verifier.c

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

2018-03-06 01:20:46 -05:00

test_xdp_meta.c

bpf: improve selftests and add tests for meta pointer

2017-09-26 13:36:44 -07:00

test_xdp_meta.sh

tools/bpf: fix batch-mode test failure of test_xdp_redirect.sh

2018-02-06 11:34:42 +01:00

test_xdp_noinline.c

selftests/bpf: add xdp noinline test

2017-12-17 20:34:36 +01:00

test_xdp_redirect.c

selftests: bpf: add a test for XDP redirect

2017-08-08 18:12:50 -07:00

test_xdp_redirect.sh

tools/bpf: fix batch-mode test failure of test_xdp_redirect.sh

2018-02-06 11:34:42 +01:00

test_xdp.c

selftests: bpf: Use bpf_endian.h in test_xdp.c

2017-05-02 07:52:01 -07:00