Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into for-linus

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 <[email protected]>

diff --cc MAINTAINERS
Simple merge

diff --cc security/selinux/avc.c
Simple merge

diff --cc security/selinux/hooks.c
index 8fb248843009de5e6b71a01cae7b884cd597ba36,9f426b8a12b5409b312349536453fa7b7bb89a56..a0d38459d650af32fe844ca18d4b5ff5ad03be98
--- 1/security/selinux/hooks.c
--- 2/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@@ -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);

diff --cc security/selinux/selinuxfs.c
Simple merge

diff --cc security/selinux/ss/services.c
Simple merge

diff --cc security/smack/smack_lsm.c
Simple merge