summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-05-16 21:10:05 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-05-16 21:10:05 -0700
commitdd8edd7e97bdc5d4b96e9f13c2fab3fdc6c9ca1f (patch)
tree0aed219030fb430b033ad8dcd9db08dcd534fa6e /Documentation
parent3f4741b1d863f624e8632b3283af5eabe35c2fca (diff)
parent1a48632ffed61352a7810ce089dc5a8bcd505a60 (diff)
downloadlinux-dd8edd7e97bdc5d4b96e9f13c2fab3fdc6c9ca1f.tar.gz
linux-dd8edd7e97bdc5d4b96e9f13c2fab3fdc6c9ca1f.tar.bz2
linux-dd8edd7e97bdc5d4b96e9f13c2fab3fdc6c9ca1f.zip
Merge tag 'tty-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty/serial fixes from Greg KH: "Here's some TTY and serial driver fixes for reported issues. All of these have been in linux-next successfully" * tag 'tty-4.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: pty: Fix input race when closing tty/n_gsm.c: fix a memory leak when gsmtty is removed Revert "serial/amba-pl011: Leave the TX IRQ alone when the UART is not open" serial: omap: Fix error handling in probe earlycon: Revert log warnings
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/serial/tty.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/serial/tty.txt b/Documentation/serial/tty.txt
index 1e52d67d0abf..dbe6623fed1c 100644
--- a/Documentation/serial/tty.txt
+++ b/Documentation/serial/tty.txt
@@ -198,6 +198,9 @@ TTY_IO_ERROR If set, causes all subsequent userspace read/write
TTY_OTHER_CLOSED Device is a pty and the other side has closed.
+TTY_OTHER_DONE Device is a pty and the other side has closed and
+ all pending input processing has been completed.
+
TTY_NO_WRITE_SPLIT Prevent driver from splitting up writes into
smaller chunks.