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_create() to umode_t *

2011-08-01 02:09:42 -04:00

endian24.h

JFS: Whitespace cleanup and remove some dead code

2007-06-06 15:28:35 -05:00

file.c

fs: take the ACL checks to common code

2011-07-25 14:30:23 -04: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

jfs_acl.h

fs: take the ACL checks to common code

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

jfs_btree.h

JFS: White space cleanup

2006-10-02 09:55:27 -05:00

jfs_debug.c

proc 2/2: remove struct proc_dir_entry::owner

2009-03-31 01:14:44 +04:00

jfs_debug.h

JFS: switch to seq_files

2008-05-13 08:22:10 -05:00

jfs_dinode.h

BKL-removal: Implement a compat_ioctl handler for JFS

2008-02-07 13:45:29 -06:00

jfs_dmap.c

jfs: clean up some compiler warnings

2011-07-25 11:01:12 -05:00

jfs_dmap.h

jfs_dmap.[ch]: trivial typo fix: s/heigth/height/g

2010-02-02 14:21:35 -06:00

jfs_dtree.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

jfs_dtree.h

jfs: remove DIRENTSIZ

2008-06-10 15:12:58 -05:00

jfs_extent.c

Fix common misspellings

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

jfs_extent.h

JFS: White space cleanup

2006-10-02 09:55:27 -05:00

jfs_filsys.h

JFS: Whitespace cleanup and remove some dead code

2007-06-06 15:28:35 -05:00

jfs_imap.c

JFS: Don't save agno in the inode

2011-06-20 10:53:46 -05:00

jfs_imap.h

JFS: Whitespace cleanup and remove some dead code

2007-06-06 15:28:35 -05:00

jfs_incore.h

jfs: agstart field must be 64 bits

2011-06-20 17:53:24 -05:00

jfs_inode.c

jfs: replace inode uid,gid,mode init with helper

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

jfs_inode.h

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

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

jfs_lock.h

JFS: use __set_current_state()

2007-04-26 07:30:29 -05:00

jfs_logmgr.c

lmLogOpen() broken failure exit

2011-06-07 08:50:59 -04:00

jfs_logmgr.h

Fix common misspellings

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

jfs_metapage.c

block: remove per-queue plugging

2011-03-10 08:52:07 +01:00

jfs_metapage.h

Fix common misspellings

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

jfs_mount.c

fix printk typo 'faild'

2010-08-09 11:25:17 +02:00

jfs_superblock.h

JFS: White space cleanup

2006-10-02 09:55:27 -05:00

jfs_txnmgr.c

jfs: clean up some compiler warnings

2011-07-25 11:01:12 -05:00

jfs_txnmgr.h

JFS: Whitespace cleanup and remove some dead code

2007-06-06 15:28:35 -05:00

jfs_types.h

jfs: remove xtLookupList()

2009-01-09 15:42:04 -06:00

jfs_umount.c

JFS: Make sure special inode data is written after journal is flushed

2008-01-03 13:11:37 -06:00

jfs_unicode.c

JFS: White space cleanup

2006-10-02 09:55:27 -05:00

jfs_unicode.h

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

jfs_uniupr.c

JFS: White space cleanup

2006-10-02 09:55:27 -05:00

jfs_xattr.h

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

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

jfs_xtree.c

dquot: cleanup space allocation / freeing routines

2010-03-05 00:20:28 +01:00

jfs_xtree.h

jfs: remove xtLookupList()

2009-01-09 15:42:04 -06:00

Kconfig

jfs: needs crc32_le

2009-02-02 13:43:28 -06:00

Makefile

fs: change to new flag variable

2011-03-17 14:02:57 +01:00

namei.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6

2011-07-27 09:26:39 -07:00

resize.c

jfs: old_agsize should be 64 bits in jfs_extendfs

2011-06-20 10:30:04 -05:00

super.c

Fix common misspellings

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

symlink.c

jfs: add jfs specific ->setattr call

2010-04-16 08:05:50 -05:00

xattr.c

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

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