tree 8fc2b3e655d93546d42fcc6c899266b92d6d3aa5
parent b39545684a90ef3374abc0969d64c7bc540d128d
parent 505ee76761062a1872b024140e886b7136a6c1d5
author Linus Torvalds <torvalds@linux-foundation.org> 1510508633 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1510508633 -0800

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

Pull perf tool fixes from Thomas Gleixner:
 "A small set of fixes for perf tool:

   - synchronize the i915 drm header to avoid the 'out of date' warning

   - make sure that perf trace cleans up its temporary files on exit

   - unbreak the build with newer flex versions

   - add missing braces in the eBPF parsing rules"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  tooling/headers: Sync the tools/include/uapi/drm/i915_drm.h UAPI header
  perf trace: Call machine__exit() at exit
  perf tools: Fix eBPF event specification parsing
  perf tools: Add "reject" option for parse-events.l