diff options
author | 2013-10-27 10:28:35 -0700 | |
---|---|---|
committer | 2013-10-27 10:28:35 -0700 | |
commit | e2756f5e0fab825d08dcfbbe6b235166035fa501 (patch) | |
tree | 4087df8fd0dc16706d2db4e57adb5c4af2fb4a2a /tools/perf/util/scripting-engines/trace-event-python.c | |
parent | Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
parent | Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent (diff) | |
download | wireguard-linux-e2756f5e0fab825d08dcfbbe6b235166035fa501.tar.xz wireguard-linux-e2756f5e0fab825d08dcfbbe6b235166035fa501.zip |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"The tree contains three fixes:
- Two tooling fixes
- Reversal of the new 'MMAP2' extended mmap record ABI, introduced in
this merge window. (Patches were proposed to fix it but it was all
a bit late and we felt it's safer to just delay the ABI one more
kernel release and do it right)"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf: Disable PERF_RECORD_MMAP2 support
perf scripting perl: Fix build error on Fedora 12
perf probe: Fix to initialize fname always before use it
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions