Hi Jan,
Today's linux-next merge of the ext3 tree got a conflict in
fs/cifs/cifsfs.c between commit b6b38f704a8193daba520493ebdaf7e819962fc8
("[CIFS] Neaten cERROR and cFYI macros, reduce text space") from the cifs
tree and commit 31bb95a8175db36ed4772008a7e81014765bb782 ("cifs: drop
quota operation stubs") from the ext3 tree.
The latter removes some of the code that the former modifies.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp586oG2SKkt.pgp
Description: PGP signature
