tree a69e9c844f1c8eebeda48afa2f8f3931f0084ad5
parent c5b5138cdb2f833a22cfa36c95d6ee41e98a0a34
parent c634dc6bdedeb0b2c750fc611612618a85639ab2
author Linus Torvalds <torvalds@linux-foundation.org> 1552839562 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1552839562 -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 fixes for the fallout from the TSX errata workaround:

   - Prevent memory corruption caused by a unchecked out of bound array
     index.

   - Two trivial fixes to address compiler warnings"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/intel: Make dev_attr_allow_tsx_force_abort static
  perf/x86: Fixup typo in stub functions
  perf/x86/intel: Fix memory corruption