* Arnaldo Carvalho de Melo <[email protected]> wrote:
> Hi Ingo,
>
> Please consider pulling,
>
> - Arnaldo
>
> Test results at the end of this message, as usual.
>
> The following changes since commit 1504269814263c9676b4605a6a91e14dc6ceac21:
>
> Merge tag 'linux-kselftest-4.17-rc4' of
> git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
> (2018-05-03 19:26:51 -1000)
>
> are available in the Git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git
> perf-urgent-for-mingo-4.17-20180507
>
> for you to fetch changes up to 4a35a9027f64d588d2fd9436dda4126e8d5647d7:
>
> Revert "perf pmu: Fix pmu events parsing rule" (2018-05-07 16:28:10 -0300)
>
> ----------------------------------------------------------------
> perf/urgent fixes:
>
> . 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 <[email protected]>
>
> ----------------------------------------------------------------
> Arnaldo Carvalho de Melo (4):
> tools headers: Sync x86 cpufeatures.h with the kernel sources
> tools headers kvm: Sync uapi/linux/kvm.h with the kernel sources
> tools headers kvm: Sync ARM UAPI headers with the kernel sources
> Revert "perf pmu: Fix pmu events parsing rule"
>
> William Cohen (1):
> perf vendor events intel: Remove duplicated entry for westmereep-dp in
> mapfile.csv
>
> Yisheng Xie (1):
> perf bench numa: Fix typo in options
>
> tools/arch/arm/include/uapi/asm/kvm.h | 6 ++++++
> tools/arch/arm64/include/uapi/asm/kvm.h | 6 ++++++
> tools/arch/x86/include/asm/cpufeatures.h | 1 +
> tools/include/uapi/linux/kvm.h | 7 +++++++
> tools/perf/bench/numa.c | 2 +-
> tools/perf/pmu-events/arch/x86/mapfile.csv | 1 -
> tools/perf/util/parse-events.y | 8 ++++----
> 7 files changed, 25 insertions(+), 6 deletions(-)
Pulled, thanks a lot Arnaldo!
Ingo
