Merge branch 'next-evm' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/ima...
James Morris [Tue, 9 Aug 2011 00:31:03 +0000 (10:31 +1000)]
Conflicts:
fs/attr.c

Resolve conflict manually.

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

1  2 
Documentation/kernel-parameters.txt
fs/attr.c
fs/btrfs/xattr.c
fs/gfs2/inode.c
fs/jfs/xattr.c
fs/xfs/linux-2.6/xfs_iops.c
include/linux/security.h
mm/shmem.c
security/integrity/ima/ima_main.c
security/security.c

Simple merge
diff --cc fs/attr.c
+++ b/fs/attr.c
@@@ -237,8 -241,13 +238,10 @@@ int notify_change(struct dentry * dentr
        else
                error = simple_setattr(dentry, attr);
  
-       if (!error)
 -      if (ia_valid & ATTR_SIZE)
 -              up_write(&dentry->d_inode->i_alloc_sem);
 -
+       if (!error) {
                fsnotify_change(dentry, ia_valid);
+               evm_inode_post_setattr(dentry, ia_valid);
+       }
  
        return error;
  }
Simple merge
diff --cc fs/gfs2/inode.c
Simple merge
diff --cc fs/jfs/xattr.c
Simple merge
Simple merge
Simple merge
diff --cc mm/shmem.c
Simple merge
Simple merge
Simple merge