linux/fs/xfs/linux-2.6
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
..
kmem.c xfs: Convert linux-2.6/ files to new logging interface 2011-03-07 10:00:35 +11:00
kmem.h xfs: replace KM_LARGE with explicit vmalloc use 2010-01-21 13:44:56 -06:00
mrlock.h
time.h
xfs_acl.c switch posix_acl_equiv_mode() to umode_t * 2011-08-01 02:10:06 -04:00
xfs_aops.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 2011-07-22 19:02:39 -07:00
xfs_aops.h xfs: kill xfs_iomap 2010-12-16 16:05:51 -06:00
xfs_buf.c xfs: flag all buffers as metadata 2011-07-26 22:05:48 -05:00
xfs_buf.h xfs: remove wrappers around b_iodone 2011-07-13 13:43:49 +02:00
xfs_discard.c xfs: add online discard support 2011-05-24 11:17:13 -05:00
xfs_discard.h xfs: add online discard support 2011-05-24 11:17:13 -05:00
xfs_export.c xfs: failure mapping nfs fh to inode should return ESTALE 2011-07-20 18:35:21 -05:00
xfs_export.h
xfs_file.c xfs: prevent against ioend livelocks in xfs_file_fsync 2011-07-26 22:06:39 -05:00
xfs_fs_subr.c xfs: use range primitives for xfs page cache operations 2010-10-18 15:07:24 -05:00
xfs_globals.c xfs: remove xfs_cred.h 2010-10-18 15:08:06 -05:00
xfs_ioctl32.c xfs: add an x86 compat handler for XFS_IOC_ZERO_RANGE 2011-04-28 13:27:46 -05:00
xfs_ioctl32.h xfs: add an x86 compat handler for XFS_IOC_ZERO_RANGE 2011-04-28 13:27:46 -05:00
xfs_ioctl.c xfs: fix misspelled S_IS...() 2011-07-26 15:05:30 -04:00
xfs_ioctl.h xfs: convert attr to use unsigned names 2010-01-20 10:47:48 +11:00
xfs_iops.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
xfs_iops.h [XFS] add a FMODE flag to make XFS invisible I/O less hacky 2008-12-11 13:14:41 +11:00
xfs_linux.h xfs: use generic get_unaligned_beXX helpers 2011-07-08 14:35:58 +02:00
xfs_message.c xfs: kill off xfs_printk() 2011-05-19 11:38:09 -05:00
xfs_message.h xfs: kill off xfs_printk() 2011-05-19 11:38:09 -05:00
xfs_quotaops.c Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 2010-08-07 12:57:07 -07:00
xfs_stats.c xfs: switch to seq_file 2009-09-15 12:29:24 -05:00
xfs_stats.h
xfs_super.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 2011-07-22 19:02:39 -07:00
xfs_super.h xfs: remove xfs_version.h 2010-10-18 15:08:04 -05:00
xfs_sync.c Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 2011-07-22 19:02:39 -07:00
xfs_sync.h Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 2011-07-22 19:02:39 -07:00
xfs_sysctl.c xfs: Convert linux-2.6/ files to new logging interface 2011-03-07 10:00:35 +11:00
xfs_sysctl.h
xfs_trace.c xfs: remove unneeded #include statements 2010-07-26 13:16:33 -05:00
xfs_trace.h fs: take the ACL checks to common code 2011-07-25 14:30:23 -04:00
xfs_vnode.h xfs: event tracing support 2009-12-14 23:08:16 -06:00
xfs_xattr.c xfs: constify xattr_handler 2010-05-21 18:31:19 -04:00