Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf tooling fixes from Thomas Gleixner: "Another small set of perf tooling fixes and updates: - Revert "perf pmu: Fix pmu events parsing rule", as it broke Intel PT event description parsing (Arnaldo Carvalho de Melo) - Sync x86's cpufeatures.h and kvm UAPI headers with the kernel sources, suppressing the ABI drift warnings (Arnaldo Carvalho de Melo) - Remove duplicated entry for westmereep-dp in Intel's mapfile.csv (William Cohen) - Fix typo in 'perf bench numa' options description (Yisheng Xie)" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: Revert "perf pmu: Fix pmu events parsing rule" tools headers kvm: Sync ARM UAPI headers with the kernel sources tools headers kvm: Sync uapi/linux/kvm.h with the kernel sources tools headers: Sync x86 cpufeatures.h with the kernel sources perf vendor events intel: Remove duplicated entry for westmereep-dp in mapfile.csv perf bench numa: Fix typo in options
Showing
- tools/arch/arm/include/uapi/asm/kvm.h 6 additions, 0 deletionstools/arch/arm/include/uapi/asm/kvm.h
- tools/arch/arm64/include/uapi/asm/kvm.h 6 additions, 0 deletionstools/arch/arm64/include/uapi/asm/kvm.h
- tools/arch/x86/include/asm/cpufeatures.h 1 addition, 0 deletionstools/arch/x86/include/asm/cpufeatures.h
- tools/include/uapi/linux/kvm.h 7 additions, 0 deletionstools/include/uapi/linux/kvm.h
- tools/perf/bench/numa.c 1 addition, 1 deletiontools/perf/bench/numa.c
- tools/perf/pmu-events/arch/x86/mapfile.csv 0 additions, 1 deletiontools/perf/pmu-events/arch/x86/mapfile.csv
- tools/perf/util/parse-events.y 4 additions, 4 deletionstools/perf/util/parse-events.y
Please register or sign in to comment