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

ext4: refactor duplicated block placement code

2011-06-28 10:01:31 -04:00

bitmap.c

…

block_validity.c

ext4: move ext4_ind_* functions from inode.c to indirect.c

2011-06-27 19:40:50 -04:00

dir.c

ext4: Use ext4_error_file() to print the pathname to the corrupted inode

2011-01-10 12:10:55 -05:00

ext4_extents.h

ext4: use FIEMAP_EXTENT_LAST flag for last extent in fiemap

2011-06-06 00:06:52 -04:00

ext4_jbd2.c

ext4: remove unneeded ext4_journal_get_undo_access

2011-05-09 10:58:45 -04:00

ext4_jbd2.h

ext4: remove unneeded ext4_journal_get_undo_access

2011-05-09 10:58:45 -04:00

ext4.h

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

2011-08-01 13:56:03 -10:00

extents.c

ext4: Fix overflow caused by missing cast in ext4_fallocate()

2011-07-27 22:11:20 -04:00

file.c

fs: take the ACL checks to common code

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

fsync.c

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

2011-08-01 13:56:03 -10:00

hash.c

…

ialloc.c

ext4: use the correct error exit path in ext4_init_inode_table()

2011-08-01 06:32:19 -04:00

indirect.c

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

2011-08-01 13:56:03 -10:00

inode.c

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

2011-08-01 13:56:03 -10:00

ioctl.c

ext4: prevent parallel resizers by atomic bit ops

2011-07-26 21:35:44 -04:00

Kconfig

…

Makefile

ext4: move ext4_ind_* functions from inode.c to indirect.c

2011-06-27 19:40:50 -04:00

mballoc.c

ext4: prevent memory leaks from ext4_mb_init_backend() on error path

2011-08-01 17:41:46 -04:00

mballoc.h

ext4: remove ac_repeats from ext4_allocation_context

2011-07-23 16:18:55 -04:00

migrate.c

ext4: set extents flag when migrating file to use extents

2011-05-03 09:34:42 -04:00

mmp.c

ext4: add support for multiple mount protection

2011-05-24 18:31:25 -04:00

move_extent.c

ext4: Fix max file size and logical block counting of extent format file

2011-06-06 00:05:17 -04:00

namei.c

Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

2011-08-01 13:56:03 -10:00

page-io.c

ext4: remove loop around bio_alloc()

2011-06-29 21:44:45 -04:00

resize.c

ext4: use ext4_kvzalloc()/ext4_kvmalloc() for s_group_desc and s_group_info

2011-08-01 08:45:38 -04:00

super.c

ext4: use kzalloc in ext4_kzalloc()

2011-08-03 14:57:11 -04:00

symlink.c

ext4: symlink must be handled via filesystem specific operation

2010-05-16 02:00:00 -04:00

truncate.h

ext4: move common truncate functions to header file

2011-06-27 19:16:04 -04: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

ext4: constify xattr_handler

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

xattr_user.c

ext4: constify xattr_handler

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

xattr.c

ext4: add flag to ext4_has_free_blocks

2011-05-25 07:41:26 -04:00

xattr.h

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

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