Hi Alan,
Today's linux-next merge of the ttydev tree got a conflict in
drivers/char/tty_io.c between commit
000b9151d7851cc1e490b2a76d0206e524f43cca ("Fix race/oops in tty layer
after BKL pushdown") from Linus' tree and commit
b3cfb0b9b2a6ca9d0bf8708688328ed65ce1ba99 ("tty-kref-get-current-tty")
from the ttydev tree.
It is just a contextual conflict (the former moved a line next to a
comment removed by the latter). I fixed it up.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpIx3l3VZiCR.pgp
Description: PGP signature
