linux/fs
James Morris 12a5a2621b Merge branch 'master' into next
Conflicts:
	include/linux/capability.h

Manually resolve merge conflict w/ thanks to Stephen Rothwell.

Signed-off-by: James Morris <jmorris@namei.org>
2011-05-19 18:51:57 +10:00
..
9p fs/9p: Fix error reported by coccicheck 2011-04-15 15:26:14 -05:00
adfs
affs
afs
autofs4
befs
bfs
btrfs Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable 2011-05-15 10:22:10 -07:00
cachefiles
ceph ceph: do not use i_wrbuffer_ref as refcount for Fb cap 2011-05-11 10:44:48 -07:00
cifs cifs: fix cifsConvertToUCS() for the mapchars case 2011-05-17 20:54:04 +00:00
coda
configfs configfs: Fix race between configfs_readdir() and configfs_d_iput() 2011-05-18 04:08:16 -07:00
cramfs
debugfs
devpts
dlm
ecryptfs eCryptfs: Flush dirty pages in setattr 2011-04-25 18:49:46 -05:00
efs
exofs
exportfs
ext2
ext3 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 2011-04-08 07:35:17 -07:00
ext4 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 2011-04-11 15:45:47 -07:00
fat
freevxfs
fscache
fuse fuse: fix oops in revalidate when called with NULL nameidata 2011-05-10 17:35:58 +02:00
gfs2 add hlist_bl_lock/unlock helpers 2011-04-25 18:14:10 -07:00
hfs
hfsplus
hostfs
hpfs HPFS: Remove unused variable 2011-05-09 09:04:24 -07:00
hppfs
hugetlbfs
isofs
jbd
jbd2 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 2011-04-11 15:45:47 -07:00
jffs2
jfs
lockd
logfs logfs: initialize superblock entries earlier 2011-05-03 16:10:25 -07:00
minix
ncpfs
nfs NFSv4.1: Ensure that layoutget uses the correct gfp modes 2011-05-11 22:52:13 -04:00
nfs_common
nfsd Open with O_CREAT flag set fails to open existing files on non writable directories 2011-04-20 11:03:01 -04:00
nilfs2 nilfs2: fix infinite loop in nilfs_palloc_freev function 2011-05-10 22:19:50 +09:00
nls
notify
ntfs
ocfs2 ocfs2/dlm: Target node death during resource migration leads to thread spin 2011-05-13 11:27:30 -07:00
omfs
openpromfs
partitions Validate size of EFI GUID partition entries. 2011-05-06 07:46:37 -07:00
proc Don't lock guardpage if the stack is growing up 2011-05-09 16:22:07 -07:00
pstore
qnx4
quota Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6 2011-04-08 07:35:17 -07:00
ramfs ramfs: fix memleak on no-mmu arch 2011-04-14 16:06:56 -07:00
reiserfs
romfs
squashfs
sysfs
sysv
ubifs UBIFS: seek journal heads to the latest bud in replay 2011-05-02 19:23:48 +03:00
udf
ufs
xfs xfs: fix race condition in AIL push trigger 2011-05-09 18:35:04 -05:00
aio.c
anon_inodes.c
attr.c
bad_inode.c
binfmt_aout.c
binfmt_elf.c brk: COMPAT_BRK: fix detection of randomized brk 2011-04-14 16:06:55 -07:00
binfmt_elf_fdpic.c
binfmt_em86.c
binfmt_flat.c CRED: Fix load_flat_shared_library() to initialise bprm correctly 2011-05-03 10:10:51 +10:00
binfmt_misc.c
binfmt_script.c
binfmt_som.c
bio-integrity.c
bio.c
block_dev.c block: rescan partitions on invalidated devices on -ENOMEDIA too 2011-04-29 10:17:26 +02:00
buffer.c
char_dev.c
compat.c
compat_binfmt_elf.c
compat_ioctl.c
dcache.c add hlist_bl_lock/unlock helpers 2011-04-25 18:14:10 -07:00
dcookies.c
direct-io.c
drop_caches.c
eventfd.c
eventpoll.c
exec.c
fcntl.c
fhandle.c fs/fhandle.c: add <linux/personality.h> for ia64 2011-04-14 16:06:56 -07:00
fifo.c
file.c vfs: avoid large kmalloc()s for the fdtable 2011-04-28 11:28:20 -07:00
file_table.c
filesystems.c fs: synchronize_rcu when unregister_filesystem success not failure 2011-04-17 10:42:01 -07:00
fs-writeback.c
fs_struct.c
generic_acl.c
inode.c
internal.h
ioctl.c
ioprio.c
Kconfig
Kconfig.binfmt
libfs.c
locks.c
Makefile
mbcache.c
mpage.c
namei.c vfs: micro-optimize acl_permission_check() 2011-05-13 11:51:01 -07:00
namespace.c Revert "vfs: Export file system uuid via /proc/<pid>/mountinfo" 2011-04-12 13:35:56 -07:00
nfsctl.c
no-block.c
open.c
pipe.c
pnode.c
pnode.h
posix_acl.c
read_write.c
read_write.h
readdir.c
select.c
seq_file.c
signalfd.c
splice.c
stack.c
stat.c
statfs.c
super.c
sync.c
timerfd.c
utimes.c
xattr.c vfs: Pass setxattr(2) flags properly 2011-04-21 07:34:44 -07:00
xattr_acl.c