Merge branch 'linus' into perf/core, to pick up fixes before merging new changes

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

diff --cc arch/x86/events/intel/uncore_snbep.c
Simple merge

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