Merge remote-tracking branch 'origin/master' into perf/core
authorPeter Zijlstra <peterz@infradead.org>
Thu, 26 Nov 2020 12:16:55 +0000 (13:16 +0100)
committerPeter Zijlstra <peterz@infradead.org>
Thu, 26 Nov 2020 12:16:55 +0000 (13:16 +0100)
commit20c7775aecea04d8ca322039969d49dcf568e0e9
tree138c057839197c9021043353e994815c0250e669
parent306e3e91edf1c6739a55312edd110d298ff498dd
parentfa02fcd94b0c8dff6cc65714510cf25ad194b90d
Merge remote-tracking branch 'origin/master' into perf/core

Further perf/core patches will depend on:

  d3f7b1bb2040 ("mm/gup: fix gup_fast with dynamic page table folding")

which is already in Linus' tree.
arch/powerpc/perf/core-book3s.c
arch/x86/events/intel/core.c
arch/x86/events/intel/cstate.c
arch/x86/events/intel/ds.c
arch/x86/events/intel/uncore.c
arch/x86/events/intel/uncore_snb.c
arch/x86/events/perf_event.h
include/linux/perf_event.h
include/uapi/linux/perf_event.h
kernel/events/core.c