Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Feb 2017 21:30:19 +0000 (13:30 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 2 Feb 2017 21:30:19 +0000 (13:30 -0800)
commit891aa1e0f13c3aaa756c69b343d6ab6f3357009b
treee1be246b2350713d738eb7a38a12348ea34c5d7e
parentc67b42f3a3f03e68bf915f32c8f7be0b726fec1a
parentfff4b87e594ad3d2e4f51e8d3d86a6f9d3d8b654
Merge branch 'perf-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull perf fixes from Ingo Molnar:
 "Five kernel fixes:

   - an mmap tracing ABI fix for certain mappings

   - a use-after-free fix, found via KASAN

   - three CPU hotplug related x86 PMU driver fixes"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/intel/uncore: Make package handling more robust
  perf/x86/intel/uncore: Clean up hotplug conversion fallout
  perf/x86/intel/rapl: Make package handling more robust
  perf/core: Fix PERF_RECORD_MMAP2 prot/flags for anonymous memory
  perf/core: Fix use-after-free bug