From: Ingo Molnar <mingo@kernel.org>
Date: Fri, 23 Jun 2017 08:03:27 +0000 (+0200)
Subject: Merge tag 'perf-urgent-for-mingo-4.12-20170622' of git://git.kernel.org/pub/scm/linux... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=977282ed17a0213c84d59498a1e3f7088e211470;p=openwrt%2Fstaging%2Fblogic.git

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>
---

977282ed17a0213c84d59498a1e3f7088e211470