[xfs-masters] linux-next: manual merge of the vfs tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi Al,
Today's linux-next merge of the vfs tree got a conflict in
fs/xfs/linux-2.6/xfs_export.c between commits
31048586a1d967e855dce8a8d420b3acbcb7d879 ("[XFS] convert xfs to use
ERR_CAST") and 293a47c282254cbae1c96cfb2e242e57c050f5c7 ("[XFS] In
several places we directly convert from the XFS inode to the") from the
xfs tree and commit 55b773e574bc6e14b11605059faeea613880b72b ("switch all
filesystems over to d_obtain_alias") from the vfs tree.

I did the obvious fixups and can carry them.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

-- Attached file included as plaintext by Ecartis --

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

iEYEARECAAYFAkihHEoACgkQjjKRsyhoI8zIQwCfRM2ajmmzBXCYNYYwDSVp5Q84
CTAAnR75x0qPZocJnDlBkwdR6In428lI
=qEY3
-----END PGP SIGNATURE-----