Merge branch 'linus' into perf/core, to pick up fixes

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

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

diff --cc arch/x86/events/perf_event.h
Simple merge

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

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

diff --cc kernel/bpf/syscall.c
Simple merge

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

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

diff --cc kernel/trace/bpf_trace.c
Simple merge