I resolved the following conflict with Linus' tree in:
git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next-creds
commit 4030dcef54030fdb4ad6ff3813ac031d7afbdf35
Merge: 1e058f1... 8d0968a...
Author: James Morris <[email protected]>
Date: Thu Aug 14 10:43:47 2008 +1000
Merge branch 'master' into next-creds
Conflicts:
fs/xfs/xfs_acl.c
Signed-off-by: James Morris <[email protected]>
diff --cc fs/xfs/xfs_acl.c
index f94e5a8,b2f639a..91d6933
--- a/fs/xfs/xfs_acl.c
+++ b/fs/xfs/xfs_acl.c
@@@ -372,7 -366,7 +366,7 @@@ xfs_acl_allow_set
return ENOTDIR;
if (vp->i_sb->s_flags & MS_RDONLY)
return EROFS;
- if (xfs_vtoi(vp)->i_d.di_uid != current_fsuid() && !capable(CAP_FOWNER))
- if (XFS_I(vp)->i_d.di_uid != current->fsuid && !capable(CAP_FOWNER))
++ if (XFS_I(vp)->i_d.di_uid != current_fsuid() && !capable(CAP_FOWNER))
return EPERM;
return 0;
}
--
James Morris
<[email protected]>
Hi James,
On Thu, 14 Aug 2008 12:42:55 +1000 (EST) James Morris <[email protected]> wrote:
>
> I resolved the following conflict with Linus' tree in:
> git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next-creds
Thanks. I have fetched it for today's linux-next.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/