Merge remote-tracking branch 'security/next'

Conflicts:
	fs/ocfs2/xattr.c

diff --cc Documentation/kernel-parameters.txt
index 0c412ff3986238d6d0af4d85f302d15cdd2685b6,cd7c861101472aa662dd08c9f89b7c82d23b0cd9..e54ec2d14aac86a97eab554e61262ad91a9cc3ce
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -49,8 -48,8 +49,9 @@@ parameter is applicable
        EDD     BIOS Enhanced Disk Drive Services (EDD) is enabled
        EFI     EFI Partitioning (GPT) is enabled
        EIDE    EIDE/ATAPI support is enabled.
+       EVM     Extended Verification Module
        FB      The frame buffer device is enabled.
 +      FTRACE  Function tracing enabled.
        GCOV    GCOV profiling is enabled.
        HW      Appropriate hardware is enabled.
        IA-64   IA-64 architecture is enabled.

diff --cc MAINTAINERS
Simple merge

diff --cc fs/btrfs/xattr.c
Simple merge

diff --cc fs/gfs2/inode.c
Simple merge

diff --cc fs/xfs/xfs_iops.c
index e6b3e76208887d2a1737515bc8f116ad9976ac1a,37194607162d38c326804c5e55a279e4124aa975..8aafac871f0632520c1f629f37543a0c52cb4e70
--- 1/fs/xfs/xfs_iops.c
--- 2/fs/xfs/linux-2.6/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@@ -95,13 -92,25 +95,30 @@@ xfs_mark_inode_dirty
  
        if (!(inode->i_state & (I_WILL_FREE|I_FREEING)))
                mark_inode_dirty(inode);
 +      else {
 +              barrier();
 +              ip->i_update_core = 1;
 +      }
 +
  }
  
+ 
+ int xfs_initxattrs(struct inode *inode, const struct xattr *xattr_array,
+                  void *fs_info)
+ {
+       const struct xattr *xattr;
+       struct xfs_inode *ip = XFS_I(inode);
+       int error = 0;
+ 
+       for (xattr = xattr_array; xattr->name != NULL; xattr++) {
+               error = xfs_attr_set(ip, xattr->name, xattr->value,
+                                    xattr->value_len, ATTR_SECURE);
+               if (error < 0)
+                       break;
+       }
+       return error;
+ }
+ 
  /*
   * Hook in SELinux.  This is not quite correct yet, what we really need
   * here (as we do for default ACLs) is a mechanism by which creation of

diff --cc kernel/cred.c
Simple merge

diff --cc security/tomoyo/common.c
Simple merge