The patch titled Subject: mm-fix-races-between-swapoff-and-flush-dcache-fix has been added to the -mm tree. Its filename is mm-fix-races-between-swapoff-and-flush-dcache-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/mm-fix-races-between-swapoff-and-flush-dcache-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/mm-fix-races-between-swapoff-and-flush-dcache-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: mm-fix-races-between-swapoff-and-flush-dcache-fix simplify page_mapping_file(), per Mike Cc: "Huang, Ying" <ying.huang@xxxxxxxxx> Cc: Mike Rapoport <rppt@xxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/util.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff -puN mm/util.c~mm-fix-races-between-swapoff-and-flush-dcache-fix mm/util.c --- a/mm/util.c~mm-fix-races-between-swapoff-and-flush-dcache-fix +++ a/mm/util.c @@ -522,8 +522,7 @@ struct address_space *page_mapping_file( { if (unlikely(PageSwapCache(page))) return NULL; - else - return page_mapping(page); + return page_mapping(page); } /* Slow path of page_mapcount() for compound pages */ _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are i-need-old-gcc.patch mm-memblock-hardcode-the-end_pfn-being-1-fix.patch mm-memblock-hardcode-the-end_pfn-being-1-fix-fix.patch arm-arch-arm-include-asm-pageh-needs-personalityh.patch mm.patch mm-page_alloc-skip-over-regions-of-invalid-pfns-on-uma-fix.patch direct-io-minor-cleanups-in-do_blockdev_direct_io-fix.patch mm-fix-races-between-swapoff-and-flush-dcache-fix.patch list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch mm-oom-cgroup-aware-oom-killer-fix.patch mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch proc-add-seq_put_decimal_ull_width-to-speed-up-proc-pid-smaps-fix.patch sysctl-add-flags-to-support-min-max-range-clamping-fix.patch linux-next-rejects.patch kernel-forkc-export-kernel_thread-to-modules.patch slab-leaks3-default-y.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html