Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into for-linus
James Morris [Tue, 24 May 2011 13:20:19 +0000 (23:20 +1000)]
Conflicts:
lib/flex_array.c
security/selinux/avc.c
security/selinux/hooks.c
security/selinux/ss/policydb.c
security/smack/smack_lsm.c

Manually resolve conflicts.

Signed-off-by: James Morris <jmorris@namei.org>

1  2 
MAINTAINERS
security/selinux/avc.c
security/selinux/hooks.c
security/selinux/selinuxfs.c
security/selinux/ss/services.c
security/smack/smack_lsm.c

diff --cc MAINTAINERS
Simple merge
Simple merge
@@@ -2730,11 -2746,11 +2748,11 @@@ static int selinux_inode_setxattr(struc
        if (!(sbsec->flags & SE_SBLABELSUPP))
                return -EOPNOTSUPP;
  
 -      if (!is_owner_or_cap(inode))
 +      if (!inode_owner_or_capable(inode))
                return -EPERM;
  
-       COMMON_AUDIT_DATA_INIT(&ad, FS);
-       ad.u.fs.path.dentry = dentry;
+       COMMON_AUDIT_DATA_INIT(&ad, DENTRY);
+       ad.u.dentry = dentry;
  
        rc = avc_has_perm(sid, isec->sid, isec->sclass,
                          FILE__RELABELFROM, &ad);
Simple merge
Simple merge
Simple merge