summaryrefslogtreecommitdiff
path: root/drivers
AgeCommit message (Collapse)Author
2008-11-12Merge commit 'osd/linux-next'Stephen Rothwell
2008-11-12Merge commit 'cputime/cputime'Stephen Rothwell
2008-11-12Merge commit 'watchdog/master'Stephen Rothwell
2008-11-12Merge commit 'uwb/for-upstream'Stephen Rothwell
2008-11-12Merge branch 'quilt/ttydev'Stephen Rothwell
2008-11-12Merge commit 'voltage/for-next'Stephen Rothwell
2008-11-12Merge commit 'hdlc/hdlc-next'Stephen Rothwell
Conflicts: Documentation/DocBook/wanbook.tmpl drivers/net/wan/syncppp.c
2008-11-12Merge commit 'mfd/for-next'Stephen Rothwell
2008-11-12Merge commit 'md/for-next'Stephen Rothwell
2008-11-12Merge commit 'pcmcia/master'Stephen Rothwell
2008-11-12Merge commit 'block/for-next'Stephen Rothwell
2008-11-12Merge commit 'input/next'Stephen Rothwell
2008-11-12Merge commit 'mmc/next'Stephen Rothwell
2008-11-12Merge branch 'quilt/rr'Stephen Rothwell
2008-11-12Merge commit 'crypto/master'Stephen Rothwell
2008-11-12Merge commit 'net/master'Stephen Rothwell
Conflicts: drivers/message/fusion/mptlan.c drivers/net/sfc/ethtool.c net/mac80211/debugfs_sta.c
2008-11-12Merge commit 'async_tx/next'Stephen Rothwell
2008-11-12Merge commit 'scsi/master'Stephen Rothwell
2008-11-12Merge commit 'ubi/linux-next'Stephen Rothwell
2008-11-12Merge commit 'ieee1394/for-next'Stephen Rothwell
2008-11-12Merge commit 'acpi/test'Stephen Rothwell
2008-11-12Merge commit 'infiniband/for-next'Stephen Rothwell
2008-11-12Merge branch 'quilt/ide'Stephen Rothwell
2008-11-12Merge commit 'v4l-dvb/master'Stephen Rothwell
2008-11-12Merge branch 'quilt/jdelvare-hwmon'Stephen Rothwell
2008-11-12Merge branch 'quilt/i2c'Stephen Rothwell
2008-11-12Merge commit 'hid/mm'Stephen Rothwell
2008-11-12Merge branch 'quilt/device-mapper'Stephen Rothwell
2008-11-12Merge commit 'pci/linux-next'Stephen Rothwell
2008-11-12Merge commit 'ftrace/auto-ftrace-next'Stephen Rothwell
2008-11-12Merge branch 'quilt/usb'Stephen Rothwell
Conflicts: drivers/net/usb/hso.c
2008-11-12Merge branch 'quilt/driver-core'Stephen Rothwell
2008-11-12Merge commit 'x86/auto-x86-next'Stephen Rothwell
2008-11-12Merge commit 's390/features'Stephen Rothwell
2008-11-12Merge commit 'pxa/for-next'Stephen Rothwell
2008-11-12Merge commit 'powerpc/next'Stephen Rothwell
2008-11-12Merge branch 'quilt/m68k'Stephen Rothwell
2008-11-12Merge commit 'arm/devel'Stephen Rothwell
Conflicts: arch/arm/mach-realview/clock.c arch/arm/mach-versatile/clock.c
2008-11-12Merge commit 'input-current/for-linus'Stephen Rothwell
2008-11-12Merge branch 'quilt/usb.current'Stephen Rothwell
2008-11-12Merge commit 'pci-current/for-linus'Stephen Rothwell
2008-11-12Merge commit 'scsi-rc-fixes/master'Stephen Rothwell
2008-11-12tty-usb-close-raceAlan Cox
USB serial has always had races where the tty port usage count can hit zero during a receive event. The internal locking is a mutex so we can't use that in the IRQ handlers. With krefs we can tackle this differently but we still need to be careful. Signed-off-by: Alan Cox <alan@redhat.com>
2008-11-12n-tty-bellJoe Peterson
This patch causes "bell" (^G) characters (invoked when the input buffer is full) to be immediately output rather than filling the echo buffer. This is especially a problem when the tty is stopped and buffers fill, since the bells do not serve their purpose of immediate notification that the buffer cannot take further input, and they will flush all at once when the tty is restarted. Signed-off-by: Joe Peterson <joe@skyrush.com>
2008-11-12n-tty-full-checksJoe Peterson
Fix the handling of input characters when the tty buffer is full or nearly full. This includes tests that are done in n_tty_receive_char() and handling of PARMRK. Problems with the buffer-full tests done in receive_char() caused characters to be lost at times when the buffer(s) filled. Also, these full conditions would often only be detected with echo on, and PARMRK was not accounted for properly in all cases. One symptom of these problems, in addition to lost characters, was early termination from unix commands like tr and cat when ^Q was used to break from a stopped tty with full buffers (note that breaking out was often previously not possible, due to the pty getting in "gridlock", which will be addressed in another patch). Note space is always reserved at the end of the buffer for a newline (or EOF/EOL) in canonical mode. Signed-off-by: Joe Peterson <joe@skyrush.com>
2008-11-12n-tty-fix-controlJoe Peterson
Fix process_output_block to detect continuation characters correctly and to handle control characters even when O_OLCUC is enabled. Make similar change to do_output_char(). Signed-off-by: Joe Peterson <joe@skyrush.com>
2008-11-12pty-simplify-resizeAlan Cox
We have special case logic for resizing pty/tty pairs. We also have a per driver resize method so for the pty case we should use it.
2008-11-12tty-sparse-warning-driver-lookupJason Wessel
Fixed sparse warning: drivers/char/tty_io.c:1216:19: warning: symbol 'tty_driver_lookup_tty' was not declared. Should it be static? Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
2008-11-12tty-trivial-usb-sierra-formatAlan Cox
Andrew Morton wrote: in drivers/usb/serial/sierra.c: } else { if (urb->actual_length) { + tty = tty_port_tty_get(&port->port); tty_buffer_request_room(tty, urb->actual_length); it's missing a tab. Signed-off-by: Alan Cox <alan@redhat.com>
2008-11-12pty-pts-multiple-instancesAlan Cox
Add DEVPTS_MULTIPLE_INSTANCES config token From: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> Signed-off-by: Alan Cox <alan@redhat.com>