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

fs: take the ACL checks to common code

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

balloc.c

ext3: Return -EINVAL when start is beyond the end of fs in ext3_trim_fs()

2011-06-25 17:29:53 +02:00

bitmap.c

…

dir.c

ext3: speed up file creates by optimizing rec_len functions

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

ext3_jbd.c

…

file.c

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6

2011-07-26 11:34:40 -07:00

fsync.c

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6

2011-07-26 11:34:40 -07:00

hash.c

…

ialloc.c

ext3: Add fixed tracepoints

2011-06-25 17:29:51 +02:00

inode.c

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6

2011-07-26 11:34:40 -07:00

ioctl.c

ext3/ioctl.c: silence sparse warnings about different address spaces

2011-06-25 17:29:53 +02:00

Kconfig

ext3: default to ordered mode

2010-07-23 12:50:55 +02:00

Makefile

…

namei.c

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6

2011-07-26 11:34:40 -07:00

namei.h

…

resize.c

Fix common misspellings

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

super.c

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6

2011-07-26 11:34:40 -07:00

symlink.c

…

xattr_security.c

security: new security_inode_init_security API adds function callback

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

xattr_trusted.c

ext3: constify xattr handlers

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

xattr_user.c

ext3: constify xattr handlers

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

xattr.c

ext3: Fix oops in ext3_try_to_allocate_with_rsv()

2011-06-25 17:29:52 +02:00

xattr.h

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

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