Merge branch 'linus' into perf/urgent, to pick up dependent commits

Signed-off-by: Ingo Molnar <[email protected]>

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

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