diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-21 10:41:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-21 10:41:19 -0700 |
| commit | 0a6109fd1b605cbfa58ae9ae9d571d0f4140b727 (patch) | |
| tree | ecb3be1ce7bab9fe8821a9c40c8ba22fbee1f32d /MAINTAINERS | |
| parent | ide: avoid warning for timings calculation (diff) | |
| parent | debug: Fix WARN_ON_ONCE() for modules (diff) | |
| download | linux-dev-0a6109fd1b605cbfa58ae9ae9d571d0f4140b727.tar.xz linux-dev-0a6109fd1b605cbfa58ae9ae9d571d0f4140b727.zip | |
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/* F: include/linux/ptp_cl* PTRACE SUPPORT -M: Roland McGrath <roland@hack.frob.com> M: Oleg Nesterov <oleg@redhat.com> S: Maintained F: include/asm-generic/syscall.h @@ -10692,7 +10691,12 @@ F: include/linux/ptrace.h F: include/linux/regset.h F: include/linux/tracehook.h F: include/uapi/linux/ptrace.h +F: include/uapi/linux/ptrace.h +F: include/asm-generic/ptrace.h F: kernel/ptrace.c +F: arch/*/ptrace*.c +F: arch/*/*/ptrace*.c +F: arch/*/include/asm/ptrace*.h PULSE8-CEC DRIVER M: Hans Verkuil <hverkuil@xs4all.nl> |