The patch titled Subject: filemap-kill-page_cache_read-usage-in-filemap_fault-fix has been added to the -mm tree. Its filename is filemap-kill-page_cache_read-usage-in-filemap_fault-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/filemap-kill-page_cache_read-usage-in-filemap_fault-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/filemap-kill-page_cache_read-usage-in-filemap_fault-fix.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: filemap-kill-page_cache_read-usage-in-filemap_fault-fix fix comment text Cc: Jan Kara <jack@xxxxxxx> Cc: Johannes Weiner <hannes@xxxxxxxxxxx> Cc: Josef Bacik <josef@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/filemap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/mm/filemap.c~filemap-kill-page_cache_read-usage-in-filemap_fault-fix +++ a/mm/filemap.c @@ -1635,8 +1635,8 @@ no_page: } /* - * add_to_page_cache_lru lock's the page, and for mmap we expect - * a unlocked page. + * add_to_page_cache_lru locks the page, and for mmap we expect + * an unlocked page. */ if (fgp_flags & FGP_FOR_MMAP) unlock_page(page); _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are arm-arch-arm-include-asm-pageh-needs-personalityh.patch ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch mm.patch mm-slab-remove-unnecessary-unlikely-fix.patch mm-slub-record-final-state-of-slub-action-in-deactivate_slab-fix.patch mm-slub-improve-performance-by-skipping-checked-node-in-get_any_partial-fix.patch mm-page_owner-clamp-read-count-to-page_size-fix.patch mm-hotplug-optimize-clear_hwpoisoned_pages-fix.patch mm-ksm-do-not-block-on-page-lock-when-searching-stable-tree-fix.patch mm-memory_hotplug-print-reason-for-the-offlining-failure-fix.patch mm-memory_hotplug-be-more-verbose-for-memory-offline-failures-fix.patch mm-convert-totalram_pages-and-totalhigh_pages-variables-to-atomic-checkpatch-fixes.patch mm-page_alloc-free-order-0-pages-through-pcp-in-page_frag_free-fix.patch mm-dont-break-integrity-writeback-on-writepage-error-fix.patch mm-use-common-iterator-for-deferred_init_pages-and-deferred_free_pages-fix.patch mm-kmemleak-little-optimization-while-scanning-fix.patch mm-mmu_notifier-use-structure-for-invalidate_range_start-end-callback-fix-fix.patch mm-mmu_notifier-use-structure-for-invalidate_range_start-end-calls-v2-checkpatch-fixes.patch filemap-kill-page_cache_read-usage-in-filemap_fault-fix.patch memory_hotplug-free-pages-as-higher-order-fix.patch memory_hotplug-free-pages-as-higher-order-fix-fix.patch fs-epoll-deal-with-wait_queue-only-once-fix.patch autofs-improve-ioctl-sbi-checks-fix.patch exec-separate-mm_anonpages-and-rlimit_stack-accounting-checkpatch-fixes.patch ipc-allow-boot-time-extension-of-ipcmni-from-32k-to-8m-checkpatch-fixes.patch linux-next-rejects.patch scripts-atomic-check-atomicssh-dont-assume-that-scripts-are-executable.patch mm-convert-pg_balloon-to-pg_offline-fix.patch fs-remove-caller-signal_pending-branch-predictions-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch slab-leaks3-default-y.patch