Merge branch 'linus' into perf/urgent

Merge reason: we need to fix a non-trivial merge conflict.

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

diff --cc arch/x86/kernel/cpu/perf_event.c
Simple merge

diff --cc include/linux/kernel.h
Simple merge

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