diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-05 04:39:56 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-05 04:39:56 +0200 |
commit | a5fff14a0c7989fbc8316a43f52aed1804f02ddd (patch) | |
tree | d8d4ef6c808868f7d42b6b44cc27b871a22d460a /lib/error-inject.c | |
parent | Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc... (diff) | |
parent | swap_readpage(): avoid blk_wake_io_task() if !synchronous (diff) | |
download | linux-a5fff14a0c7989fbc8316a43f52aed1804f02ddd.tar.xz linux-a5fff14a0c7989fbc8316a43f52aed1804f02ddd.zip |
Merge branch 'akpm' (patches from Andrew)
Merge more fixes from Andrew Morton:
"5 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
swap_readpage(): avoid blk_wake_io_task() if !synchronous
devres: allow const resource arguments
mm/vmscan.c: prevent useless kswapd loops
fs/userfaultfd.c: disable irqs for fault_pending and event locks
mm/page_alloc.c: fix regression with deferred struct page init
Diffstat (limited to 'lib/error-inject.c')
0 files changed, 0 insertions, 0 deletions