From: Ingo Molnar Date: Thu, 10 May 2018 18:09:00 +0000 (+0200) Subject: Merge tag 'perf-urgent-for-mingo-4.17-20180507' of git://git.kernel.org/pub/scm/linux... X-Git-Tag: Ubuntu-5.2.0-15.16~4434^2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=49cf4a4b3f5a8b02556dd4f45c5cee598d4fc799;p=mirror_ubuntu-eoan-kernel.git Merge tag 'perf-urgent-for-mingo-4.17-20180507' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent Pull perf/urgent fixes from Arnaldo Carvalho de Melo: . 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) Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Ingo Molnar --- 49cf4a4b3f5a8b02556dd4f45c5cee598d4fc799