tree 10f54f40da96c519ba2d781cae9398dfc73a3a2c
parent 2507c856620cc7474e6101b0a05f82ac0ae5bf69
parent 3bf6215a1b30db7df6083c708caab3fe1a8e8abe
author Linus Torvalds <torvalds@linux-foundation.org> 1474746268 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1474746268 -0700

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

Pull perf fixes from Thomas Gleixner:
 "Three fixlets for perf:

   - add a missing NULL pointer check in the intel BTS driver

   - make BTS an exclusive PMU because BTS can only handle one event at
     a time

   - ensure that exclusive events are limited to one PMU so that several
     exclusive events can be scheduled on different PMU instances"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/core: Limit matching exclusive events to one PMU
  perf/x86/intel/bts: Make it an exclusive PMU
  perf/x86/intel/bts: Make sure debug store is valid