tree 72d7719e484340ddca3d5cf2710823f25a5d6542
parent 500e1af25209a048daa1f1f86083d4849d5c555b
parent 9d020d33fc1b2faa0eb35859df1381ca5dc94ffe
author Linus Torvalds <torvalds@linux-foundation.org> 1488926296 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1488926296 -0800

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

Pull perf fixes from Ingo Molnar:
 "This includes a fix for a crash if certain special addresses are
  kprobed, plus does a rename of two Kconfig variables that were a minor
  misnomer"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/core: Rename CONFIG_[UK]PROBE_EVENT to CONFIG_[UK]PROBE_EVENTS
  kprobes/x86: Fix kernel panic when certain exception-handling addresses are probed