Merge remote-tracking branch 'torvalds/master' into perf/core

To pick up fixes, since perf/urgent is already upstream.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --cc tools/perf/Makefile.config
Simple merge

diff --cc tools/perf/builtin-record.c
Simple merge

diff --cc tools/perf/tests/shell/stat_bpf_counters.sh
Simple merge

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

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

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

diff --cc tools/perf/util/stat-display.c
Simple merge