Merge tag 'perf-urgent-for-mingo-4.12-20170622' of git://git.kernel.org/pub/scm/linux...
authorIngo Molnar <mingo@kernel.org>
Fri, 23 Jun 2017 08:03:27 +0000 (10:03 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 23 Jun 2017 08:03:27 +0000 (10:03 +0200)
commit977282ed17a0213c84d59498a1e3f7088e211470
tree97f1766246ce07bc230516b11b31603deaf93bcb
parentfb3a5055cd7098f8d1dd0cd38d7172211113255f
parent7598f8bc1383ffd77686cb4e92e749bef3c75937
Merge tag 'perf-urgent-for-mingo-4.12-20170622' of git://git./linux/kernel/git/acme/linux into perf/urgent

Pull 'perf probe' fix from Arnaldo Carvalho de Melo:

 - Do not double the offset of inline expansions when using
   'perf probe' on inlined functions (Björn Töpel)

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