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

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi David,
Today's linux-next merge of the creds tree got a conflict in
fs/xfs/xfs_acl.c between commit 6811235504abbeed42673cf70014759f39e12a9b
("[XFS] XFS: Kill xfs_vtoi()") from the xfs tree and commit
785af0f385cd424d4b40908bf0e467df3dc05434 ("CRED: Change current->fs[ug]id
to current_fs[ug]id()") from the creds tree.

I did the obvious fixup.

-- 
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)

iEYEARECAAYFAkib4uwACgkQjjKRsyhoI8zbpACgkjv1EmzuloYm/9mvB+siZIyh
u/4AoK8kTsz+mpjwSCloIEQa7ysIh/w3
=+CkI
-----END PGP SIGNATURE-----