Merge remote-tracking branch 'bpf-next/for-next'

diff --cc kernel/bpf/btf.c
Simple merge

diff --cc kernel/bpf/syscall.c
Simple merge

diff --cc kernel/bpf/verifier.c
Simple merge

diff --cc net/core/filter.c
Simple merge

diff --cc tools/lib/bpf/libbpf.c
Simple merge

diff --cc tools/lib/bpf/libbpf_internal.h
Simple merge