James Morris 5a2f3a02ae Merge branch 'next-evm' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/ima-2.6 into next ...

Conflicts:
	fs/attr.c

Resolve conflict manually.

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

2011-08-09 10:31:03 +10:00

..

acl.c

switch posix_acl_equiv_mode() to umode_t *

2011-08-01 02:10:06 -04:00

acl.h

ext2: remove duplicate 'ext2_get_acl()' define

2011-07-29 23:21:50 -07:00

balloc.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

dir.c

ext2: speed up file creates by optimizing rec_len functions

2011-01-10 19:04:06 +01:00

ext2.h

fs: push i_mutex and filemap_write_and_wait down into ->fsync() handlers

2011-07-20 20:47:59 -04:00

file.c

fs: take the ACL checks to common code

2011-07-25 14:30:23 -04:00

ialloc.c

fs/vfs/security: pass last path component to LSM on inode creation

2011-02-01 11:12:29 -05:00

inode.c

fs: simplify the blockdev_direct_IO prototype

2011-07-20 20:47:49 -04:00

ioctl.c

userns: rename is_owner_or_cap to inode_owner_or_capable

2011-03-23 19:47:13 -07:00

Kconfig

fs/Kconfig: move ext2, ext3, ext4, JBD, JBD2 out

2008-10-20 11:43:59 -07:00

Makefile

switch ext2 to simple_fsync()

2009-06-11 21:36:12 -04:00

namei.c

fs: take the ACL checks to common code

2011-07-25 14:30:23 -04:00

super.c

ext2: fix error msg when mounting fs with too-large blocksize

2011-05-17 13:47:42 +02:00

symlink.c

ext2: symlink must be handled via filesystem specific operation

2010-04-12 21:11:25 +02:00

xattr_security.c

security: new security_inode_init_security API adds function callback

2011-07-18 12:29:38 -04:00

xattr_trusted.c

ext2: constify xattr_handler

2010-05-21 18:31:18 -04:00

xattr_user.c

ext2: constify xattr_handler

2010-05-21 18:31:18 -04:00

xattr.c

ext2: check xattr name_len before acquiring xattr_sem in ext2_xattr_get

2011-07-22 19:41:16 +02:00

xattr.h

fs/vfs/security: pass last path component to LSM on inode creation

2011-02-01 11:12:29 -05:00

xip.c

ext2: Unify log messages in ext2

2009-12-10 15:02:52 +01:00

xip.h

xip: support non-struct page backed memory

2008-04-28 08:58:23 -07:00