Hi Dave,
Today's linux-next merge of the net tree got a conflict in fs/lockd/mon.c
between commit 9e414471988c5558df3674b94e145d8f926a683f ("NSM: Support
IPv6 version of mon_name") from the nfsd tree and commit
be859405487324ed548f1ba11dc949b8230ab991 ("fs: replace NIPQUAD()") from
the net tree.
The former removed the code that the latter modified. However, the nfsd
tree has added some more usages of the NIP macros ...
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpXLDlFJT9Yn.pgp
Description: PGP signature
