diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-14 21:57:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-07-14 21:57:25 -0700 |
| commit | 867eacd7fb975273703766f52f485f08471a1ae9 (patch) | |
| tree | be3c024c940d34331d5329a61a8e2be64f21da17 /MAINTAINERS | |
| parent | 077d2ba519b2e8bf1abd80cbade699b1de42cafe (diff) | |
| parent | 6d7964a722afc8e4f880b947f174009063028c99 (diff) | |
| download | op-kernel-dev-867eacd7fb975273703766f52f485f08471a1ae9.zip op-kernel-dev-867eacd7fb975273703766f52f485f08471a1ae9.tar.gz | |
Merge branch 'akpm' (patches from Andrew)
Merge even more updates from Andrew Morton:
- a few leftovers
- fault-injector rework
- add a module loader test driver
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
kmod: throttle kmod thread limit
kmod: add test driver to stress test the module loader
MAINTAINERS: give kmod some maintainer love
xtensa: use generic fb.h
fault-inject: add /proc/<pid>/fail-nth
fault-inject: simplify access check for fail-nth
fault-inject: make fail-nth read/write interface symmetric
fault-inject: parse as natural 1-based value for fail-nth write interface
fault-inject: automatically detect the number base for fail-nth write interface
kernel/watchdog.c: use better pr_fmt prefix
MAINTAINERS: move the befs tree to kernel.org
lib/atomic64_test.c: add a test that atomic64_inc_not_zero() returns an int
mm: fix overflow check in expand_upwards()
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4bae99c..428e042 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2516,10 +2516,10 @@ S: Supported F: drivers/media/platform/sti/delta BEFS FILE SYSTEM -M: Luis de Bethencourt <luisbg@osg.samsung.com> +M: Luis de Bethencourt <luisbg@kernel.org> M: Salah Triki <salah.triki@gmail.com> S: Maintained -T: git git://github.com/luisbg/linux-befs.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/luisbg/linux-befs.git F: Documentation/filesystems/befs.txt F: fs/befs/ @@ -7554,6 +7554,15 @@ F: include/linux/kmemleak.h F: mm/kmemleak.c F: mm/kmemleak-test.c +KMOD MODULE USERMODE HELPER +M: "Luis R. Rodriguez" <mcgrof@kernel.org> +L: linux-kernel@vger.kernel.org +S: Maintained +F: kernel/kmod.c +F: include/linux/kmod.h +F: lib/test_kmod.c +F: tools/testing/selftests/kmod/ + KPROBES M: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com> M: Anil S Keshavamurthy <anil.s.keshavamurthy@intel.com> |
