Merge remote-tracking branch 'selinux/master'

diff --cc include/linux/security.h
Simple merge

diff --cc security/capability.c
Simple merge

diff --cc security/security.c
Simple merge

diff --cc security/selinux/hooks.c
index 1e028937781b25bb847d1a22ee7f9d5411821122,c09211a4d7da2b88398d702b87defb1f3a1d2f00..d0aa173dd3bc2f462f8aa599adc160d5475e6611
--- 1/security/selinux/hooks.c
--- 2/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@@ -2628,11 -2665,15 +2665,11 @@@ static int selinux_inode_init_security(
                isec->initialized = 1;
        }
  
-       if (!ss_initialized || !(sbsec->flags & SE_SBLABELSUPP))
+       if (!ss_initialized || !(sbsec->flags & SBLABEL_MNT))
                return -EOPNOTSUPP;
  
 -      if (name) {
 -              namep = kstrdup(XATTR_SELINUX_SUFFIX, GFP_NOFS);
 -              if (!namep)
 -                      return -ENOMEM;
 -              *name = namep;
 -      }
 +      if (name)
 +              *name = XATTR_SELINUX_SUFFIX;
  
        if (value && len) {
                rc = security_sid_to_context_force(newsid, &context, &clen);

diff --cc security/selinux/include/xfrm.h
Simple merge