Hi Alan,
Today's linux-next merge of the ttydev tree got a conflict in
drivers/char/tty_io.c between commit
8c9a9dd0fa3a269d380eaae2dc1bee39e865fae1 ("tty: remove resize window
special case") from Linus' tree (which appears to also be in the ttydev
tree as "tty-remove-resize-special") and commit
2283faa9cec083b6ddc1fa02a974ce1c797e847f ("tty-fix-pty-termios-race")
from the ttydev tree.
The latter is just further changes, so I took the ttydev tree version.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpPrkGHAZqvw.pgp
Description: PGP signature
