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()
Showing
- Documentation/fault-injection/fault-injection.txt 11 additions, 10 deletionsDocumentation/fault-injection/fault-injection.txt
- MAINTAINERS 11 additions, 2 deletionsMAINTAINERS
- arch/xtensa/include/asm/Kbuild 1 addition, 0 deletionsarch/xtensa/include/asm/Kbuild
- arch/xtensa/include/asm/fb.h 0 additions, 12 deletionsarch/xtensa/include/asm/fb.h
- fs/proc/base.c 17 additions, 24 deletionsfs/proc/base.c
- include/linux/sched.h 1 addition, 1 deletioninclude/linux/sched.h
- kernel/kmod.c 7 additions, 9 deletionskernel/kmod.c
- kernel/watchdog.c 1 addition, 1 deletionkernel/watchdog.c
- lib/Kconfig.debug 27 additions, 0 deletionslib/Kconfig.debug
- lib/Makefile 1 addition, 0 deletionslib/Makefile
- lib/atomic64_test.c 7 additions, 0 deletionslib/atomic64_test.c
- lib/fault-inject.c 5 additions, 2 deletionslib/fault-inject.c
- lib/test_kmod.c 1246 additions, 0 deletionslib/test_kmod.c
- mm/mmap.c 1 addition, 1 deletionmm/mmap.c
- tools/testing/selftests/kmod/Makefile 11 additions, 0 deletionstools/testing/selftests/kmod/Makefile
- tools/testing/selftests/kmod/config 7 additions, 0 deletionstools/testing/selftests/kmod/config
- tools/testing/selftests/kmod/kmod.sh 615 additions, 0 deletionstools/testing/selftests/kmod/kmod.sh
Please register or sign in to comment