diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-21 13:41:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-21 13:41:19 -0400 |
| commit | 0a6109fd1b605cbfa58ae9ae9d571d0f4140b727 (patch) | |
| tree | ecb3be1ce7bab9fe8821a9c40c8ba22fbee1f32d /MAINTAINERS | |
| parent | 921edf312a6a20be16cf2b60e0dec3dce35e5cb9 (diff) | |
| parent | 325cdacd03c12629aa5f9ee2ace49b1f3dc184a8 (diff) | |
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core fixes from Ingo Molnar:
"A fix to WARN_ON_ONCE() done by modules, plus a MAINTAINERS update"
* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
debug: Fix WARN_ON_ONCE() for modules
MAINTAINERS: Update the PTRACE entry
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 297e610c9163..2784ac59801d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -10684,7 +10684,6 @@ F: drivers/ptp/* | |||
| 10684 | F: include/linux/ptp_cl* | 10684 | F: include/linux/ptp_cl* |
| 10685 | 10685 | ||
| 10686 | PTRACE SUPPORT | 10686 | PTRACE SUPPORT |
| 10687 | M: Roland McGrath <roland@hack.frob.com> | ||
| 10688 | M: Oleg Nesterov <oleg@redhat.com> | 10687 | M: Oleg Nesterov <oleg@redhat.com> |
| 10689 | S: Maintained | 10688 | S: Maintained |
| 10690 | F: include/asm-generic/syscall.h | 10689 | F: include/asm-generic/syscall.h |
| @@ -10692,7 +10691,12 @@ F: include/linux/ptrace.h | |||
| 10692 | F: include/linux/regset.h | 10691 | F: include/linux/regset.h |
| 10693 | F: include/linux/tracehook.h | 10692 | F: include/linux/tracehook.h |
| 10694 | F: include/uapi/linux/ptrace.h | 10693 | F: include/uapi/linux/ptrace.h |
| 10694 | F: include/uapi/linux/ptrace.h | ||
| 10695 | F: include/asm-generic/ptrace.h | ||
| 10695 | F: kernel/ptrace.c | 10696 | F: kernel/ptrace.c |
| 10697 | F: arch/*/ptrace*.c | ||
| 10698 | F: arch/*/*/ptrace*.c | ||
| 10699 | F: arch/*/include/asm/ptrace*.h | ||
| 10696 | 10700 | ||
| 10697 | PULSE8-CEC DRIVER | 10701 | PULSE8-CEC DRIVER |
| 10698 | M: Hans Verkuil <hverkuil@xs4all.nl> | 10702 | M: Hans Verkuil <hverkuil@xs4all.nl> |