Merge tag 'perf-core-for-bpf-next' from tip tree

Stable tag for bpf-next's uprobe work.

Signed-off-by: Andrii Nakryiko <andrii@kernel.org>

diff --cc arch/Kconfig
Simple merge

diff --cc kernel/trace/bpf_trace.c
Simple merge

diff --cc kernel/trace/trace_uprobe.c
Simple merge

diff --cc tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c
Simple merge