Hi Alan,
Today's linux-next merge of the ttydev tree got a conflict in
drivers/char/tty_io.c between commit
e9b4b8816d7516318a3472f600ad9734e300c7bc ("device create: char: convert
device_create_drvdata to device_create") from the driver-core tree and
commit ee32c06e38600122f51aca2de893d1027251719a
("tty-move-special-cases") from the ttydev tree.
The latter moved some code that the former modified
(device_create_drvdata -> device_create changes).
I basically just used the version from the ttydev tree.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgplVBZSvWrgf.pgp
Description: PGP signature
