Merge branch 'perf/urgent' into perf/core

Merge the latest fixes.

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

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

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

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

diff --cc tools/perf/config/feature-checks/Makefile
Simple merge

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

diff --cc tools/perf/util/symbol-elf.c
Simple merge

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