linux-next: manual merge of the ext3 tree with the cifs tree

Stephen Rothwell <[email protected]> Wed, 12 May 2010 10:13:15 +1000

Newsgroups	gmane.linux.kernel.next,gmane.linux.kernel,gmane.linux.file-systems.cifs
Message-ID	<[email protected]>

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                    [email protected]
http://www.canb.auug.org.au/~sfr/

signature.asc (application/pgp-signature, 198 B)

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iEYEARECAAYFAkvp8psACgkQjjKRsyhoI8w3UgCfSpdLB6ClPekNSMTfOSI077v4
btwAn1hOjQiwzhPzd22YLl2tRmQAGFCF
=Ezih
-----END PGP SIGNATURE-----