Merge commit 'v2.6.39' into 20110526
Eric Paris [Thu, 26 May 2011 21:20:14 +0000 (17:20 -0400)]
Conflicts:
lib/flex_array.c
security/selinux/avc.c
security/selinux/hooks.c
security/selinux/ss/policydb.c
security/smack/smack_lsm.c

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

diff --cc MAINTAINERS
Simple merge
@@@ -2746,11 -2730,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