Merge tag 'perf-urgent-for-mingo-5.6-20200228' of...
Merge tag 'perf-urgent-for-mingo-5.6-20200228' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent Pull perf/urgent fixes from Arnaldo Carvalho de Melo: perf annotate: Ravi Bangoria: - Fix segfault with source toggle. - Fix --show-total-period and --show-nr-samples for tui/stdio2. - Fix handling of settings in ~/.perfconfig versus the ones passed in the command line - Re-render title bar after switching back from script browser. - Fix options man page, document some missing ones. perf probe: He Zhe: - Check return value of strlist__add() for -ENOMEM. tools UAPI: Arnaldo Carvalho de Melo: - Sync x86's msr-index.h copy with the kernel sources. - Update tools's copy of x86's kvm.h headers. Signed-off-by:Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by:
Ingo Molnar <mingo@kernel.org>
Showing
- tools/arch/x86/include/asm/msr-index.h 2 additions, 0 deletionstools/arch/x86/include/asm/msr-index.h
- tools/arch/x86/include/uapi/asm/kvm.h 1 addition, 0 deletionstools/arch/x86/include/uapi/asm/kvm.h
- tools/perf/Documentation/perf-config.txt 73 additions, 1 deletiontools/perf/Documentation/perf-config.txt
- tools/perf/builtin-annotate.c 2 additions, 2 deletionstools/perf/builtin-annotate.c
- tools/perf/builtin-probe.c 4 additions, 2 deletionstools/perf/builtin-probe.c
- tools/perf/builtin-report.c 1 addition, 1 deletiontools/perf/builtin-report.c
- tools/perf/builtin-top.c 2 additions, 2 deletionstools/perf/builtin-top.c
- tools/perf/ui/browsers/annotate.c 9 additions, 10 deletionstools/perf/ui/browsers/annotate.c
- tools/perf/ui/gtk/annotate.c 1 addition, 1 deletiontools/perf/ui/gtk/annotate.c
- tools/perf/util/annotate.c 75 additions, 119 deletionstools/perf/util/annotate.c
- tools/perf/util/annotate.h 3 additions, 6 deletionstools/perf/util/annotate.h
- tools/perf/util/config.c 12 additions, 0 deletionstools/perf/util/config.c
- tools/perf/util/config.h 1 addition, 0 deletionstools/perf/util/config.h
- tools/perf/util/probe-file.c 24 additions, 4 deletionstools/perf/util/probe-file.c
Loading
Please register or sign in to comment