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.

diff --cc arch/powerpc/perf/core-book3s.c
Simple merge

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

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

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

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

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

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

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

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

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