tree a4e2827002e649b2555b5575974b6c03d82e371a
parent d295917a47e99fe43f1efb14261612e67120e4bb
parent f2200ac311302fcdca6556fd0c5127eab6c65a3e
author Linus Torvalds <torvalds@linux-foundation.org> 1492214318 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1492214318 -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:
 "Two small fixes for perf:

   - the move to support cross arch annotation introduced per arch
     initialization requirements, fullfill them for s/390 (Christian
     Borntraeger)

   - add the missing initialization to the LBR entries to avoid exposing
     random or stale data"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86: Avoid exposing wrong/stale data in intel_pmu_lbr_read_32()
  perf annotate s390: Fix perf annotate error -95 (4.10 regression)