diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-13 10:44:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-13 10:44:32 -0700 |
| commit | baeda7131f54e71e916c43d7a88cb68fcace37da (patch) | |
| tree | 67a320522dca3f4aa28517077a2cd0a6351d9fdf /kernel/sched | |
| parent | 0503fd658d47503a9bad67aced45c46b1ecfaace (diff) | |
| parent | 49cf4a4b3f5a8b02556dd4f45c5cee598d4fc799 (diff) | |
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
Diffstat (limited to 'kernel/sched')
0 files changed, 0 insertions, 0 deletions