Merge remote-tracking branch 'torvalds/master' into perf/core

To pick up BPF changes we'll need.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --cc MAINTAINERS
Simple merge

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

diff --cc arch/x86/kvm/x86.c
Simple merge

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

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