summaryrefslogtreecommitdiffstats
path: root/fs/gfs2/aops.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2019-12-06 08:54:41 +0100
committerIngo Molnar <mingo@kernel.org>2019-12-06 08:54:41 +0100
commit0f60a0bcc1b96d531fa623ab520f863f1292c75b (patch)
tree30560c020dfcab8b05519732edd16810e3059b3c /fs/gfs2/aops.c
parent9f58c93efdffc2cba91fdcee010b3e5e8860334d (diff)
parentfd9bee5e24141d00e23b66d1b51bc759efa7e3fe (diff)
downloadlinux-0f60a0bcc1b96d531fa623ab520f863f1292c75b.tar.bz2
Merge tag 'perf-urgent-for-mingo-5.5-20191205' of git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'fs/gfs2/aops.c')
0 files changed, 0 insertions, 0 deletions