The patch titled fs-truncate-blocks-outside-i_size-after-generic_file_direct_write-error-fix has been removed from the -mm tree. Its filename was fs-truncate-blocks-outside-i_size-after-generic_file_direct_write-error-fix.patch This patch was dropped because it had testing failures The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: fs-truncate-blocks-outside-i_size-after-generic_file_direct_write-error-fix From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> fix comment Cc: Dmitri Monakhov <dmonakhov@xxxxxxxxxx> Cc: Jeff Moyer <jmoyer@xxxxxxxxxx> Cc: Nick Piggin <nickpiggin@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/filemap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN mm/filemap.c~fs-truncate-blocks-outside-i_size-after-generic_file_direct_write-error-fix mm/filemap.c --- a/mm/filemap.c~fs-truncate-blocks-outside-i_size-after-generic_file_direct_write-error-fix +++ a/mm/filemap.c @@ -2123,7 +2123,7 @@ generic_file_direct_write(struct kiocb * * of course not the data as we did direct DMA for the IO. * i_mutex is held in case of DIO_LOCKING, which protects * generic_osync_inode() from livelocking. If it is not held, then - * the filesystem must prevent this livelock by its own meaner. + * the filesystem must prevent this livelock by its own means. * AIO O_DIRECT ops attempt to sync metadata here. */ out: _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are freezer_cg-use-thaw_process-in-unfreeze_cgroup.patch fs-remove-prepare_write-commit_write.patch nfsd-fix-vm-overcommit-crash.patch autofs4-collect-version-check-return-checkpatch-fixes.patch maintainers-make-ioat-easier-to-find.patch mm-remove-the-might_sleep-from-lock_page.patch linux-next.patch linux-next-rejects.patch next-remove-localversion.patch arch-x86-kernel-setupc-omit-dmi_low_memory_corruption-when-it-is-unneeded.patch tick-schedc-suppress-needless-timer-reprogramming.patch linux-timexh-cleanup-for-userspace.patch drivers-input-touchscreen-ucb1400_tsc-needs-gpio.patch pci-uninline-pci_ioremap_bar.patch cpusets-update-mems-allowed-in-page-allocator-fix.patch scsi-dpt_i2o-is-bust-on-ia64.patch mm-invoke-oom-killer-from-page-fault-fix.patch mm-invoke-oom-killer-from-page-fault-fix-fix-2.patch fs-truncate-blocks-outside-i_size-after-generic_file_direct_write-error-fix.patch mm-write_cache_pages-more-terminate-quickly.patch init-properly-placing-noinline-keyword.patch oops-handling-ensure-that-any-oops-is-flushed-to-the-mtdoops-console-fix.patch spi_gpio-driver-cleanups.patch rtc-rtc-wm8350-add-support-for-wm8350-rtc.patch rtc-basic-implementation-of-epson-rx-8581-i2c-real-time-clock-fix.patch quota-permit-separately-enabling-quota-accounting-and-enforcing-limits-fix.patch quota-move-quotaio_vh-from-include-linux-to-fs-fix.patch quota-move-quotaio_vh-from-include-linux-to-fs-fix-2.patch quota-convert-union-in-mem_dqinfo-to-a-pointer-cleanup.patch quota-support-64-bit-quota-format-fix.patch quota-support-64-bit-quota-format-fix-2.patch memcg-introduce-charge-commit-cancel-style-of-functions-fix.patch w1-export-w1_read_8-function-checkpatch-fixes.patch nilfs2-inode-operations-fix.patch nilfs2-pathname-operations-fix.patch nilfs2-super-block-operations-fix.patch reiser4.patch reiser4-tree_lock-fixes.patch reiser4-tree_lock-fixes-fix.patch reiser4-semaphore-fix.patch slb-drop-kmem-cache-argument-from-constructor-reiser4.patch reiser4-suid.patch reiser4-track-upstream-changes.patch reiser4-broke.patch nr_blockdev_pages-in_interrupt-warning.patch slab-leaks3-default-y.patch put_bh-debug.patch shrink_slab-handle-bad-shrinkers.patch getblk-handle-2tb-devices.patch getblk-handle-2tb-devices-fix.patch undeprecate-pci_find_device.patch notify_change-callers-must-hold-i_mutex.patch profile-likely-unlikely-macros.patch drivers-net-bonding-bond_sysfsc-suppress-uninitialized-var-warning.patch w1-build-fix.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