From: Ingo Molnar <mingo@kernel.org>
Date: Sat, 28 Oct 2017 14:16:11 +0000 (+0200)
Subject: Merge tag 'perf-urgent-for-mingo-4.14-20171027' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: MMI-PSA29.97-13-9~4418^2~3
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4139433c9a81a6ee21e5293989122c203a14a6d8;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'perf-urgent-for-mingo-4.14-20171027' of git://git./linux/kernel/git/acme/linux into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

- Fix memory corruption in the annotation routines because of zero
  length symbols (asm ones) (Ravi Bangoria)

- Fix printing garbage as an error message when re-running the
  lexer events matcher (Jiri Olsa)

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

4139433c9a81a6ee21e5293989122c203a14a6d8