* Arnaldo Carvalho de Melo <a...@kernel.org> wrote:
> Hi Ingo,
>
> Please consider pulling,
>
> - Arnaldo
>
> Test results at the end of this message, as usual.
>
> The following changes since commit 631fe154edb0a37308d0116a0f9b7bba9dca6218:
>
> perf/x86: Update rdpmc_always_available static key to the modern API
> (2018-03-27 07:53:00 +0200)
>
> are available in the Git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git
> tags/perf-core-for-mingo-4.17-20180328
>
> for you to fetch changes up to 109d59b900e78834c66657dd4748fcedb9a1fe8d:
>
> perf vendor events s390: Add JSON files for IBM z14 (2018-03-27 13:13:39
> -0300)
>
> ----------------------------------------------------------------
> perf/core improvements and fixes:
>
> - Be consistent when checking if a perf_mmap instance had
> its ring buffer unmmaped, fixing segfaults noticed in
> 'perf trace' (Kan Liang, Arnaldo Carvalho de Melo)
>
> - Avoid adding the same option multiple times to the 'diff'
> command in check-headers.sh (Jiri Olsa)
>
> - Add vendor event files (JSON format) to various IBM
> s390 models (z10EC, z10BC, z196, zEC12, zBC12, z13
> and z14) (Thomas Richter)
>
> Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
>
> ----------------------------------------------------------------
> Arnaldo Carvalho de Melo (1):
> perf mmap: Be consistent when checking for an unmaped ring buffer
>
> Jiri Olsa (1):
> perf build: Fix check-headers.sh opts assignment
>
> Kan Liang (1):
> perf mmap: Fix accessing unmapped mmap in perf_mmap__read_done()
>
> Thomas Richter (5):
> perf vendor events s390: Add JSON files for IBM z10EC z10BC
> perf vendor events s390: Add JSON files for IBM z196
> perf vendor events s390: Add JSON files for IBM zEC12 zBC12
> perf vendor events s390: Add JSON files for IBM z13
> perf vendor events s390: Add JSON files for IBM z14
>
> tools/perf/check-headers.sh | 1 +
> tools/perf/pmu-events/arch/s390/cf_z10/basic.json | 74 +++++
> tools/perf/pmu-events/arch/s390/cf_z10/crypto.json | 98 ++++++
> .../perf/pmu-events/arch/s390/cf_z10/extended.json | 110 +++++++
> tools/perf/pmu-events/arch/s390/cf_z13/basic.json | 74 +++++
> tools/perf/pmu-events/arch/s390/cf_z13/crypto.json | 98 ++++++
> .../perf/pmu-events/arch/s390/cf_z13/extended.json | 338
> +++++++++++++++++++++
> tools/perf/pmu-events/arch/s390/cf_z14/basic.json | 50 +++
> tools/perf/pmu-events/arch/s390/cf_z14/crypto.json | 98 ++++++
> .../perf/pmu-events/arch/s390/cf_z14/extended.json | 320 +++++++++++++++++++
> tools/perf/pmu-events/arch/s390/cf_z196/basic.json | 74 +++++
> .../perf/pmu-events/arch/s390/cf_z196/crypto.json | 98 ++++++
> .../pmu-events/arch/s390/cf_z196/extended.json | 146 +++++++++
> .../perf/pmu-events/arch/s390/cf_zec12/basic.json | 74 +++++
> .../perf/pmu-events/arch/s390/cf_zec12/crypto.json | 98 ++++++
> .../pmu-events/arch/s390/cf_zec12/extended.json | 212 +++++++++++++
> tools/perf/pmu-events/arch/s390/mapfile.csv | 6 +
> tools/perf/util/mmap.c | 19 +-
> 18 files changed, 1987 insertions(+), 1 deletion(-)
> create mode 100644 tools/perf/pmu-events/arch/s390/cf_z10/basic.json
> create mode 100644 tools/perf/pmu-events/arch/s390/cf_z10/crypto.json
> create mode 100644 tools/perf/pmu-events/arch/s390/cf_z10/extended.json
> create mode 100644 tools/perf/pmu-events/arch/s390/cf_z13/basic.json
> create mode 100644 tools/perf/pmu-events/arch/s390/cf_z13/crypto.json
> create mode 100644 tools/perf/pmu-events/arch/s390/cf_z13/extended.json
> create mode 100644 tools/perf/pmu-events/arch/s390/cf_z14/basic.json
> create mode 100644 tools/perf/pmu-events/arch/s390/cf_z14/crypto.json
> create mode 100644 tools/perf/pmu-events/arch/s390/cf_z14/extended.json
> create mode 100644 tools/perf/pmu-events/arch/s390/cf_z196/basic.json
> create mode 100644 tools/perf/pmu-events/arch/s390/cf_z196/crypto.json
> create mode 100644 tools/perf/pmu-events/arch/s390/cf_z196/extended.json
> create mode 100644 tools/perf/pmu-events/arch/s390/cf_zec12/basic.json
> create mode 100644 tools/perf/pmu-events/arch/s390/cf_zec12/crypto.json
> create mode 100644 tools/perf/pmu-events/arch/s390/cf_zec12/extended.json
> create mode 100644 tools/perf/pmu-events/arch/s390/mapfile.csv
Pulled, thanks a lot Arnaldo!
Ingo
