diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-30 12:11:36 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-30 12:11:36 -0700 |
commit | 7f7d556496a025e5334d52df9e1ebe3674cda22a (patch) | |
tree | 8381f6643367fa6ca26a0f9f6325baca155a9a12 /arch/x86/events/msr.c | |
parent | 228ffba23e6865651c12626d5b46524a205ba810 (diff) | |
parent | 9ecabeded80b0ea60a75a8ed7df0c90cd36e6a3d (diff) |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Thomas Gleixner:
"This update contains:
- a fix for the bpf tools to use the new EM_BPF code
- a fix for the module parser of perf to retrieve the
proper text start address
- add str_error_c to libapi to avoid linking against
tools/lib/str_error_r.o"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
tools lib api: Add str_error_c to libapi
perf s390: Fix 'start' address of module's map
tools lib bpf: Use official ELF e_machine value
Diffstat (limited to 'arch/x86/events/msr.c')
0 files changed, 0 insertions, 0 deletions