Merge tag 'perf-urgent-for-mingo-20160726' of git://git.kernel.org/pub/scm/linux...
authorIngo Molnar <mingo@kernel.org>
Wed, 27 Jul 2016 09:01:06 +0000 (11:01 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 27 Jul 2016 09:01:06 +0000 (11:01 +0200)
commite4b3e0694bbc0350251e22abc215a7ff506f9162
treecf7db39821a1e7f7db736019888fec03285fb81c
parent37e13a1ebe32c4fbfbdb5413f42eb6e71d8b28a4
parent203d8a4aa6edf2c19206316d439ec5dae52ce581
Merge tag 'perf-urgent-for-mingo-20160726' of git://git./linux/kernel/git/acme/linux into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

 - Fix obtaining the 'start' address for a kernel module on s390, where
   .text doesn't coincide with the start of the module as reported in
   /proc/modules (Song Shan Gong)

 - Use official ELF e_machine value for BPF objects generated via perf + LLVM
   when specifying BPF scriptlet in 'perf record/trace --event' (Wang Nan)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>