Merge branch 'linus' into perf/core, to pick up fixes

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

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

diff --cc tools/perf/util/intel-pt-decoder/intel-pt-insn-decoder.c
Simple merge