Merge branch 'perf/urgent' into auto-latest

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

diff --cc kernel/events/internal.h
Simple merge

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

diff --cc tools/perf/util/hist.h
Simple merge

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