diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-30 21:45:30 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-30 21:45:30 +0300 |
| commit | 0634922a78f08df22037ec4ddee717f92d892a68 (patch) | |
| tree | 7885f09c621366bb9f8e13e2ac6edd9d81ecd485 /MAINTAINERS | |
| parent | fb20c03d3748fc6991dd58a3161c0d954485c2ce (diff) | |
| parent | 7f635ff187ab6be0b350b3ec06791e376af238ab (diff) | |
| download | linux-0634922a78f08df22037ec4ddee717f92d892a68.tar.xz | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf fixes from Ingo Molnar:
"Misc fixes:
- AMD IBS data corruptor fix (uncovered by UBSAN)
- an Intel PEBS entry unwind error fix
- a HW-tracing crash fix
- a MAINTAINERS update"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf/core: Fix crash when using HW tracing kernel filters
perf/x86/intel: Fix unwind errors from PEBS entries (mk-II)
MAINTAINERS: Add Naveen N. Rao as kprobes co-maintainer
perf/x86/amd/ibs: Don't access non-started event
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 32fbc6f732d4..f6a9b0842319 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7985,7 +7985,7 @@ F: lib/test_kmod.c F: tools/testing/selftests/kmod/ KPROBES -M: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com> +M: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> M: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com> M: "David S. Miller" <davem@davemloft.net> M: Masami Hiramatsu <mhiramat@kernel.org> |