Merge 'bpf-next' from https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git (for-next) Merged-SHA: c79536c8146951cdad31cbced25d8e6bd1cad6c1 arch/arm64/include/asm/pgtable.h | 4 - include/linux/bpf_verifier.h | 13 +-- include/uapi/linux/bpf.h | 7 +- kernel/bpf/syscall.c | 4 +- kernel/bpf/verifier.c | 15 ++-- kernel/trace/bpf_trace.c | 60 +++++++++++--- net/core/filter.c | 15 +++- tools/bpf/Makefile | 1 + tools/bpf/bpftool/Makefile | 15 +++- tools/include/uapi/linux/bpf.h | 7 +- tools/lib/bpf/Makefile | 17 ++-- tools/lib/bpf/bpf.c | 1 + tools/lib/bpf/bpf.h | 3 +- tools/testing/selftests/bpf/Makefile | 19 +++-- .../selftests/bpf/prog_tests/fill_link_info.c | 2 +- .../selftests/bpf/prog_tests/setget_sockopt.c | 78 ++++++++++++++++++ .../selftests/bpf/prog_tests/uprobe_multi_test.c | 94 +++++++++++++++++++++- .../selftests/bpf/prog_tests/verifier_log.c | 1 + tools/testing/selftests/bpf/progs/setget_sockopt.c | 23 ++++++ .../selftests/bpf/progs/test_fill_link_info.c | 2 +- .../selftests/bpf/progs/test_global_func3.c | 52 +++++++++++- .../selftests/bpf/progs/verifier_liveness_exp.c | 2 +- .../selftests/bpf/progs/verifier_scalar_ids.c | 25 +++--- tools/testing/selftests/bpf/verifier/calls.c | 48 +++++++++++ 24 files changed, 438 insertions(+), 70 deletions(-)