tree d6655ea1a9d8a7dda3948a2eef055b6188d00026
parent 4b65f455c787eeca1a6eb8cc8f590ade6cecb179
parent f3903c9161f0d636a7b0ff03841628928457e64c
author Linus Torvalds <torvalds@linux-foundation.org> 1526840322 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1526840322 -0700

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

Pull perf tooling fixes from Thomas Gleixner:

 - fix segfault when processing unknown threads in cs-etm

 - fix "perf test inet_pton" on s390 failing due to missing inline

 - display all available events on 'perf annotate --stdio'

 - add missing newline when parsing an empty BPF program

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf tools: Add missing newline when parsing empty BPF proggie
  perf cs-etm: Remove redundant space
  perf cs-etm: Support unknown_thread in cs_etm_auxtrace
  perf annotate: Display all available events on --stdio
  perf test: "probe libc's inet_pton" fails on s390 due to missing inline