Hi Eric,
Today's linux-next merge of the v9fs tree got a conflict in
include/net/9p/9p.h between commit
d5c003b4d1690e666dbab02bc8e705947baa848c ("include: replace __FUNCTION__
with __func__") from Linus' tree and commit
33363af997469100ed3f56c2eb43da06f2a1795b ("9p: eliminate depricated conv
functions") from the v9fs tree.
The latter included the former's change, so I just used the latter.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpjhDUGNiC2f.pgp
Description: PGP signature
