Skip to content
  • Linus Torvalds's avatar
    Merge branch 'akpm' (patches from Andrew) · 867eacd7
    Linus Torvalds authored
    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()
    867eacd7