diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-03-29 09:21:21 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-03-29 09:21:21 +0200 |
| commit | 78282bec4b4a02a13b87d01fbe529396d37db926 (patch) | |
| tree | 569507ad1593cf114a4a12959dafffa4f9e9f39b /net/sched/em_ipset.c | |
| parent | 631fe154edb0a37308d0116a0f9b7bba9dca6218 (diff) | |
| parent | 109d59b900e78834c66657dd4748fcedb9a1fe8d (diff) | |
Merge tag 'perf-core-for-mingo-4.17-20180328' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
- 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 <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/sched/em_ipset.c')
0 files changed, 0 insertions, 0 deletions