]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit64ffaa025f6328209b5a7b622ac88127127a8542
tree97f1766246ce07bc230516b11b31603deaf93bcb
parent06e31f8c94fdd6e8f7f506cd2d72dcac41e233db
parent692ba4063884e61f67de1765eea531e7b308f69a
Merge tag 'perf-urgent-for-mingo-4.12-20170622' of git://git.kernel.org/pub/scm/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>