From: Ingo Molnar <mingo@kernel.org>
Date: Fri, 6 Dec 2019 07:54:41 +0000 (+0100)
Subject: Merge tag 'perf-urgent-for-mingo-5.5-20191205' of git://git.kernel.org/pub/scm/linux... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0f60a0bcc1b96d531fa623ab520f863f1292c75b;p=openwrt%2Fstaging%2Fblogic.git

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

Pull perf fixes from Arnaldo Carvalho de Melo:

perf inject:

  Adrian Hunter:

  - Fix processing of ID index for injected instruction tracing

perf report:

  Ravi Bangoria:

  - Replace pr_err() with ui__error(), so that we can see the output
    in the TUI mode instead of showing and immediately restoring the
    screen to the state before perf was started.

  - Don't start --mem-mode/--branch-mode mode if required samples are not
    available.

tools headers UAPI:

  Arnaldo Carvalho de Melo:

  - Sync drm/i915_drm.h with the kernel sources

  - Update tools's copy of drm.h headers.

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

0f60a0bcc1b96d531fa623ab520f863f1292c75b