Merge remote-tracking branch 'torvalds/master' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 26 Nov 2019 14:06:19 +0000 (11:06 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Tue, 26 Nov 2019 14:06:19 +0000 (11:06 -0300)
commit2ea352d5960ad469f5712cf3e293db97beac4e01
treec24ae19073f2884867b310ee193d36a82075b60f
parentceb9e77324fa661b1001a0ae66f061b5fcb4e4e6
parentbe2eca94d144e3ffed565c483a58ecc76a869c98
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>
MAINTAINERS
arch/x86/events/intel/core.c
arch/x86/kvm/x86.c
include/linux/perf_event.h
kernel/events/core.c