Merge branch 'perf/core'

diff --cc include/uapi/linux/perf_event.h
Simple merge

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