The patch titled Subject: shmem-fix-faulting-into-a-hole-while-its-punched-checkpatch-fixes has been removed from the -mm tree. Its filename was shmem-fix-faulting-into-a-hole-while-its-punched-checkpatch-fixes.patch This patch was dropped because it was folded into shmem-fix-faulting-into-a-hole-while-its-punched.patch ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: shmem-fix-faulting-into-a-hole-while-its-punched-checkpatch-fixes ERROR: trailing whitespace #64: FILE: mm/shmem.c:1243: +^I * wait on i_mutex to be released if vmf->flags permits, $ WARNING: Missing a blank line after declarations #68: FILE: mm/shmem.c:1247: + struct shmem_falloc *shmem_falloc; + spin_lock(&inode->i_lock); total: 1 errors, 1 warnings, 92 lines checked NOTE: whitespace errors detected, you may wish to use scripts/cleanpatch or scripts/cleanfile ./patches/shmem-fix-faulting-into-a-hole-while-its-punched.patch has style problems, please review. If any of these errors are false positives, please report them to the maintainer, see CHECKPATCH in MAINTAINERS. Please run checkpatch prior to sending patches Cc: Hugh Dickins <hughd@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/shmem.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff -puN mm/shmem.c~shmem-fix-faulting-into-a-hole-while-its-punched-checkpatch-fixes mm/shmem.c --- a/mm/shmem.c~shmem-fix-faulting-into-a-hole-while-its-punched-checkpatch-fixes +++ a/mm/shmem.c @@ -1240,10 +1240,11 @@ static int shmem_fault(struct vm_area_st * prevent the hole-punch from ever completing: which in turn * locks writers out with its hold on i_mutex. So refrain from * faulting pages into the hole while it's being punched, and - * wait on i_mutex to be released if vmf->flags permits, + * wait on i_mutex to be released if vmf->flags permits. */ if (unlikely(inode->i_private)) { struct shmem_falloc *shmem_falloc; + spin_lock(&inode->i_lock); shmem_falloc = inode->i_private; if (!shmem_falloc || _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch maintainers-akpm-maintenance.patch cpu-hotplug-smp-flush-any-pending-ipi-callbacks-before-cpu-offline.patch hugetlb-fix-copy_hugetlb_page_range-to-handle-migration-hwpoisoned-entry.patch kernel-watchdogc-print-traces-for-all-cpus-on-lockup-detection.patch mm-thp-fix-debug_pagealloc-oops-in-copy_page_rep.patch shmem-fix-faulting-into-a-hole-while-its-punched.patch ocfs2-do-not-return-dlm_migrate_response_mastery_ref-to-avoid-endlessloop-during-umount.patch ia64-arch-ia64-include-uapi-asm-fcntlh-needs-personalityh.patch kernel-posix-timersc-code-clean-up-checkpatch-fixes.patch input-route-kbd-leds-through-the-generic-leds-layer.patch ocfs2-free-inode-when-i_count-becomes-zero-checkpatch-fixes.patch mm.patch slub-use-new-node-functions-checkpatch-fixes.patch slab-use-get_node-and-kmem_cache_node-functions-fix-2.patch slab-use-get_node-and-kmem_cache_node-functions-fix-2-fix.patch mm-page_allocc-unexport-alloc_pages_exact_nid.patch dma-cma-support-arbitrary-bitmap-granularity-fix.patch mm-hugetlbfs-fix-rmapping-for-anonymous-hugepages-with-page_pgoff-v3-fix.patch mm-introduce-do_shared_fault-and-drop-do_fault-fix-fix.patch mm-compactionc-isolate_freepages_block-small-tuneup.patch do_shared_fault-check-that-mmap_sem-is-held.patch list-fix-order-of-arguments-for-hlist_add_after_rcu-checkpatch-fixes.patch add-lib-globc-fix.patch fs-isofs-logging-clean-up-fix.patch linux-next.patch drivers-gpio-gpio-zevioc-fix-build.patch mm-replace-remap_file_pages-syscall-with-emulation-fix.patch memcg-deprecate-memoryforce_empty-knob-fix.patch debugging-keep-track-of-page-owners.patch journal_add_journal_head-debug.patch journal_add_journal_head-debug-fix.patch kernel-forkc-export-kernel_thread-to-modules.patch mutex-subsystem-synchro-test-module.patch slab-leaks3-default-y.patch put_bh-debug.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