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

To pick up the fixes in perf/urgent that were just merged into upstream.

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

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

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

diff --cc tools/perf/pmu-events/jevents.c
Simple merge

diff --cc tools/perf/tests/code-reading.c
Simple merge