The patch titled do_tty_write-can-block-even-with-o_nonblock-tidy has been removed from the -mm tree. Its filename was do_tty_write-can-block-even-with-o_nonblock-tidy.patch This patch was dropped because it was folded into do_tty_write-can-block-even-with-o_nonblock.patch ------------------------------------------------------ Subject: do_tty_write-can-block-even-with-o_nonblock-tidy From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Cc: Alan Cox <alan@xxxxxxxxxx> Cc: Dave Johnson <djohnson+linux-kernel@xxxxxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/char/tty_io.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff -puN drivers/char/tty_io.c~do_tty_write-can-block-even-with-o_nonblock-tidy drivers/char/tty_io.c --- a/drivers/char/tty_io.c~do_tty_write-can-block-even-with-o_nonblock-tidy +++ a/drivers/char/tty_io.c @@ -1702,8 +1702,7 @@ static inline ssize_t do_tty_write( if (file->f_flags & O_NONBLOCK) { if (!mutex_trylock(&tty->atomic_write_lock)) return -EAGAIN; - } - else { + } else { if (mutex_lock_interruptible(&tty->atomic_write_lock)) return -ERESTARTSYS; } _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch mm-move-common-segment-checks-to-separate-helper-function-v7.patch reduce-size-of-task_struct-on-64-bit-machines.patch mm-shrink-parent-dentries-when-shrinking-slab.patch merge-sys_clone-sys_unshare-nsproxy-and-namespace.patch virtual_eisa_root_init-should-be-__init.patch proc-maps-protection.patch fix-cycladesh-for-x86_64-and-probably-others.patch rtc-add-rtc-rs5c313-driver.patch enlarge-console-name.patch move-die-notifier-handling-to-common-code.patch fix-sscanf-%n-match-at-end-of-input-string.patch parport-dev-driver-model-support.patch add-support-for-deferrable-timers-respun.patch linux-sysdevh-needs-to-include-linux-moduleh.patch time-smp-friendly-alignment-of-struct-clocksource.patch move-timekeeping-code-to-timekeepingc.patch fix-kevents-childs-priority-greediness.patch display-all-possible-partitions-when-the-root-filesystem-failed-to-mount.patch enhance-initcall_debug-measure-latency.patch dtlk-fix-error-checks-in-module_init.patch document-spin_lock_unlocked-rw_lock_unlocked-deprecation.patch consolidate-asm-consth-to-linux-consth.patch driver-for-the-maxim-ds1wm-a-1-wire-bus-master-asic-core.patch do_tty_write-can-block-even-with-o_nonblock.patch do_tty_write-can-block-even-with-o_nonblock-tidy.patch lib-hexdump-fix.patch pasemi-hardware-rng-driver-tidy.patch nbd-check-the-return-value-of-sysfs_create_file-fix.patch mutex_lock_interruptible-add-__must_check.patch mutex_lock_interruptible-add-__must_check-must-fix.patch tty-add-compat_ioctl-fix.patch blacklist-dell-optiplex-320-from-using-the-hpet-fix.patch define-and-use-new-eventscpu_lock_acquire-and-cpu_lock_release.patch call-cpu_chain-with-cpu_down_failed-if-cpu_down_prepare-failed-vs-reduce-size-of-task_struct-on-64-bit-machines.patch kthread-dont-depend-on-work-queues-take-2.patch fix-kthread_create-vs-freezer-theoretical-race.patch make-cancel_rearming_delayed_work-reliable-spelling.patch speedup-divides-by-cpu_power-in-scheduler.patch utimensat-implementation.patch revert-rtc-add-rtc_merge_alarm.patch declare-struct-ktime.patch make-futex_wait-use-an-hrtimer-for-timeout.patch kprobes-the-on-off-knob-thru-debugfs-updated.patch atomich-add-atomic64-cmpxchg-xchg-and-add_unless-to-powerpc.patch local_t-powerpc-extension.patch linux-kernel-markers-i386-optimization.patch signal-timer-event-fds-v9-signalfd-core.patch signal-timer-event-fds-v9-timerfd-core.patch signal-timer-event-fds-v9-eventfd-core.patch revoke-core-code-fix-shared-mapping-revoke.patch revoke-wire-up-i386-system-calls.patch x86-serial-convert-legacy-com-ports-to-platform-devices.patch lguest-vs-x86_64-mm-use-per-cpu-variables-for-gdt-pda.patch lguest-the-host-code-vs-x86_64-mm-i386-separate-hardware-defined-tss-from-linux-additions.patch lguest-the-host-code-vs-futex-new-private-futexes.patch fs-convert-core-functions-to-zero_user_page-pass-kmap-type.patch fs-convert-core-functions-to-zero_user_page-fix-2.patch ntfs-use-zero_user_page-fix.patch make-vm-statistics-update-interval-configurable-fix.patch rename-thread_info-to-stack-fix.patch char-cyclades-conditions-cleanup-fix.patch char-cyclades-probe-cleanup-fix.patch reiser4-slab-allocators-remove-slab_debug_initial-flag.patch fbdev-hecuba-framebuffer-driver.patch vt-add-color-support-to-the-underline-and-italic-attributes-fix.patch sm501fb-printk-warning-fixes.patch integrity-new-hooks-fix.patch integrity-evm-as-an-integrity-service-provider-tidy.patch integrity-evm-as-an-integrity-service-provider-tidy-fix.patch integrity-evm-as-an-integrity-service-provider-tidy-fix-2.patch integrity-ima-integrity_measure-support-tidy.patch integrity-ima-integrity_measure-support-fix.patch integrity-ima-integrity_measure-support-fix-2.patch integrity-tpm-internal-kernel-interface-tidy.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