Hi Al, Dave,
In merging your vfs tree today, I get a conflict between commit
9e57c9b50551a21e056fea654b3aac5db7c33ec9 ("[PATCH] r/o bind mounts:
elevate write count for ioctls()") and commit
c657925dc0057ed2ec0db845a1a4f56651adfe39 ("[XFS] The forward declarations
for the xfs_ioctl() helpers and the") in the xfs tree. Basically the
whole xfs_ioctl function has been moved by the latter commit while Dave's
patch modifies it slightly.
I have fixed it up for today and am not really sure what we can do about
it (hopefully git-rerere will fix it for me from now on, so I can carry
it, but it will conflict when merged into Linus' tree).
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
-- Attached file included as plaintext by Ecartis --
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
-----END PGP SIGNATURE-----