tree 1f3218b72700fe097f67e5d29b79ac4a351d9006
parent 2113caed87dd372e5ca2d9b3cba415f4da38936b
parent cf3beb7c90a8efa16a06b26634cddddc92bb819c
author Linus Torvalds <torvalds@linux-foundation.org> 1461899944 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1461899944 -0700

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf fixes from Ingo Molnar:
 "x86 PMU driver fixes plus a core code race fix"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/intel: Fix incorrect lbr_sel_mask value
  perf/x86/intel/pt: Don't die on VMXON
  perf/core: Fix perf_event_open() vs. execve() race
  perf/x86/amd: Set the size of event map array to PERF_COUNT_HW_MAX
  perf/core: Make sysctl_perf_cpu_time_max_percent conform to documentation
  perf/x86/intel/rapl: Add missing Haswell model
  perf/x86/intel: Add model number for Skylake Server to perf