Merge branch 'linus' into perf/core, to refresh the branch

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc include/linux/perf_event.h
Simple merge

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

diff --cc kernel/events/core.c
Simple merge

diff --cc tools/perf/util/evsel.c
Simple merge

diff --cc tools/perf/util/parse-events.c
Simple merge

diff --cc tools/perf/util/session.c
Simple merge