From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 30 Jul 2016 19:11:36 +0000 (-0700)
Subject: Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: MMI-PSA29.97-13-9~7455
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7f7d556496a025e5334d52df9e1ebe3674cda22a;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'perf-urgent-for-linus' of git://git./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
---

7f7d556496a025e5334d52df9e1ebe3674cda22a