The patch titled Subject: block-document-blk-plug-v3-fix has been removed from the -mm tree. Its filename was block-document-blk-plug-v3-fix.patch This patch was dropped because it was folded into block-document-blk-plug.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: block-document-blk-plug-v3-fix reapply grammatical fixes which got lost Cc: Jens Axboe <axboe@xxxxxxxxx> Cc: Jonathan Corbet <corbet@xxxxxxx> Cc: Shaohua Li <shaohua.li@xxxxxxxxx> Cc: Suresh Jayaraman <sjayaraman@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxx> --- block/blk-core.c | 2 +- include/linux/blkdev.h | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff -puN block/blk-core.c~block-document-blk-plug-v3-fix block/blk-core.c --- a/block/blk-core.c~block-document-blk-plug-v3-fix +++ a/block/blk-core.c @@ -2641,7 +2641,7 @@ EXPORT_SYMBOL(kblockd_schedule_delayed_w * for a memory allocation, memory reclaim could end up wanting to free a * page belonging to that request that is currently residing in our private * plug. By flushing the pending I/O when the process goes to sleep, we avoid - * this kind of deadlocks. + * this kind of deadlock. */ void blk_start_plug(struct blk_plug *plug) { diff -puN include/linux/blkdev.h~block-document-blk-plug-v3-fix include/linux/blkdev.h --- a/include/linux/blkdev.h~block-document-blk-plug-v3-fix +++ a/include/linux/blkdev.h @@ -863,15 +863,15 @@ struct request_queue *blk_alloc_queue_no extern void blk_put_queue(struct request_queue *); /* - * blk_plug allows to build up a queue of related requests by holding the I/O + * blk_plug permits building a queue of related requests by holding the I/O * fragments for a short period. This allows merging of sequential requests - * into single larger request. As the requests are moved from per-task list to - * the device's request_queue in a batch, this results in improved - * scalability as the lock contention for request_queue lock is reduced. + * into single larger request. As the requests are moved from a per-task list to + * the device's request_queue in a batch, this results in improved scalability + * as the lock contention for request_queue lock is reduced. * * It is ok not to disable preemption when adding the request to the plug list - * or when attempting merge, because blk_schedule_flush_list() will only flush - * the plug list when the task sleeps by itself. For details, please check + * or when attempting a merge, because blk_schedule_flush_list() will only flush + * the plug list when the task sleeps by itself. For details, please see * schedule() where blk_schedule_flush_plug() is called. */ struct blk_plug { _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch linux-next.patch i-need-old-gcc.patch arch-alpha-kernel-systblss-remove-debug-check.patch kernel-timec-change-jiffies_to_clock_t-input-parameters-type-to-unsigned-long.patch arch-x86-platform-iris-irisc-register-a-platform-device-and-a-platform-driver.patch leds-new-pcengines-alix-system-driver-enables-leds-via-gpio-interface.patch drivers-message-fusion-mptbasec-ensure-nul-termination-of-mptcallbacksname-elements.patch block-document-blk-plug.patch block-blk-sysfsc-fix-kerneldoc-references.patch mm.patch mm-add-comments-to-explain-mm_struct-fields-fix.patch vmscan-use-atomic-long-for-shrinker-batching-fix.patch mm-avoid-null-pointer-access-in-vm_struct-via-proc-vmallocinfo.patch thp-mremap-support-and-tlb-optimization-fix.patch thp-mremap-support-and-tlb-optimization-fix-fix.patch mm-neaten-warn_alloc_failed-fix.patch debug-pagealloc-add-support-for-highmem-pages-fix.patch mm-compaction-compact-unevictable-pages-checkpatch-fixes.patch mm-add-extra-free-kbytes-tunable-update-checkpatch-fixes.patch mm-add-comment-explaining-task-state-setting-in-bdi_forker_thread-fix.patch mm-mmapc-eliminate-the-ret-variable-from-mm_take_all_locks-fix.patch include-linux-securityh-fix-security_inode_init_security-arg.patch frv-duplicate-output_buffer-of-e03-checkpatch-fixes.patch hpet-factor-timer-allocate-from-open.patch dynamic_debug-consolidate-repetitive-struct-_ddebug-descriptor-definitions.patch dynamic_debug-use-a-single-printk-to-emit-messages.patch treewide-use-__printf-not-__attribute__formatprintf-checkpatch-fixes.patch fs-nameic-remove-unused-getname_flags.patch leds-route-kbd-leds-through-the-generic-leds-layer.patch leds-route-kbd-leds-through-the-generic-leds-layer-fix.patch lib-bitmapc-quiet-sparse-noise-about-address-space-fix.patch llist-return-whether-list-is-empty-before-adding-in-llist_add-fix.patch lib-crc-add-slice-by-8-algorithm-to-crc32c-fix.patch lib-hexdumpc-make-hex2bin-return-the-updated-src-address.patch fs-binfmt_miscc-use-kernels-hex_to_bin-method-fix.patch fs-binfmt_miscc-use-kernels-hex_to_bin-method-fix-fix.patch ipc-introduce-shm_rmid_forced-sysctl-testing.patch sysctl-add-support-for-poll-fix.patch pps-new-client-driver-using-gpio-fix.patch scatterlist-new-helper-functions.patch scatterlist-new-helper-functions-update-fix.patch memstick-add-support-for-legacy-memorysticks-fix.patch kexec-remove-kmsg_dump_kexec.patch aio-allocate-kiocbs-in-batches-fix.patch aio-allocate-kiocbs-in-batches-fix-fix.patch dio-separate-fields-only-used-in-the-submission-path-from-struct-dio-checkpatch-fixes.patch dio-inline-the-complete-submission-path-v2-checkpatch-fixes.patch dio-merge-direct_io_walker-into-__blockdev_direct_io-checkpatch-fixes.patch dio-optimize-cache-misses-in-the-submission-path-v2-checkpatch-fixes.patch journal_add_journal_head-debug.patch mutex-subsystem-synchro-test-module-fix.patch slab-leaks3-default-y.patch put_bh-debug.patch memblock-add-input-size-checking-to-memblock_find_region.patch memblock-add-input-size-checking-to-memblock_find_region-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