Hi Alan,
Today's linux-next merge of the ttydev tree got a conflict in
drivers/net/usb/hso.c between commit
e9690d2f637dd16bf20bc4d69b51ba72fb211822 ("hso: fix oops in read/write
callbacks") from the usb tree and commit
37a8d3fef248ae274c93974972469e0c36e21f73 ("tty-kref-hso") from the ttydev
tree.
Overlapping fixes. I fixed them up as seemed obvious.
[Alan, I assume your patches will get better changelogs ...]
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpMVRfbl4Bkj.pgp
Description: PGP signature
