Merge branch 'perf/core'

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

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

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

diff --cc kernel/sched/fair.c
Simple merge