[xfs-masters] linux-next: vfs/xfs merge failure

[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_ioctl.c with the xfs tree.  This is because the
patch "[XFS] The forward declarations for the xfs_ioctl() helpers" is now
in both trees but both trees have further conflicting changes ("split
xfs_ioc_xattr" and "r/o bind mounts: elevate write count for ioctls()").

:-(

I fixed it up.
-- 
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.6 (GNU/Linux)

iD8DBQFIAwcLTgG2atn1QN8RAhEDAJ0balH58BCzzWjeBl0vAHzz4GsfKQCfUKly
zFHqd6EcBOcQBR0pm4lsjnY=
=ZLon
-----END PGP SIGNATURE-----