Merge branch 'next-mtd' of git://aeryn.fluff.org.uk/bjdooks/linux

2026-11-13 07:31:07 +00:00 · 2009-06-08 12:21:27 +01:00 · 2009-06-08 12:21:27 +01:00 · e635a01ea0
commit e635a01ea0
parent 143070e746 947391cfba
714 changed files with 20654 additions and 6764 deletions
--- a/fs/9p/vfs_super.c
+++ b/fs/9p/vfs_super.c
--- a/fs/affs/super.c
+++ b/fs/affs/super.c
--- a/fs/afs/super.c
+++ b/fs/afs/super.c
--- a/fs/binfmt_flat.c
+++ b/fs/binfmt_flat.c
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
--- a/fs/cachefiles/internal.h
+++ b/fs/cachefiles/internal.h
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
--- a/fs/cifs/cifssmb.c
+++ b/fs/cifs/cifssmb.c
--- a/fs/cifs/dir.c
+++ b/fs/cifs/dir.c
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
--- a/fs/cifs/link.c
+++ b/fs/cifs/link.c
--- a/fs/dcache.c
+++ b/fs/dcache.c
--- a/fs/devpts/inode.c
+++ b/fs/devpts/inode.c
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
--- a/fs/eventpoll.c
+++ b/fs/eventpoll.c
--- a/fs/exec.c
+++ b/fs/exec.c
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
--- a/fs/fcntl.c
+++ b/fs/fcntl.c
--- a/fs/fscache/internal.h
+++ b/fs/fscache/internal.h
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
--- a/fs/gfs2/glock.c
+++ b/fs/gfs2/glock.c
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
--- a/fs/hpfs/super.c
+++ b/fs/hpfs/super.c
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
--- a/fs/inode.c
+++ b/fs/inode.c
--- a/fs/jffs2/erase.c
+++ b/fs/jffs2/erase.c
--- a/fs/libfs.c
+++ b/fs/libfs.c
--- a/fs/lockd/svc.c
+++ b/fs/lockd/svc.c
--- a/fs/namei.c
+++ b/fs/namei.c
--- a/fs/namespace.c
+++ b/fs/namespace.c
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
--- a/fs/nfs/nfsroot.c
+++ b/fs/nfs/nfsroot.c
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
--- a/fs/nfsd/vfs.c
+++ b/fs/nfsd/vfs.c
--- a/fs/nilfs2/ioctl.c
+++ b/fs/nilfs2/ioctl.c
--- a/fs/nilfs2/mdt.c
+++ b/fs/nilfs2/mdt.c
--- a/fs/nilfs2/nilfs.h
+++ b/fs/nilfs2/nilfs.h
--- a/fs/nilfs2/page.c
+++ b/fs/nilfs2/page.c
--- a/fs/nilfs2/recovery.c
+++ b/fs/nilfs2/recovery.c
--- a/fs/nilfs2/segment.c
+++ b/fs/nilfs2/segment.c
--- a/fs/nilfs2/segment.h
+++ b/fs/nilfs2/segment.h
--- a/fs/ocfs2/symlink.c
+++ b/fs/ocfs2/symlink.c
--- a/fs/open.c
+++ b/fs/open.c
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
--- a/fs/proc/root.c
+++ b/fs/proc/root.c
--- a/fs/reiserfs/dir.c
+++ b/fs/reiserfs/dir.c
--- a/fs/reiserfs/namei.c
+++ b/fs/reiserfs/namei.c
--- a/fs/reiserfs/super.c
+++ b/fs/reiserfs/super.c
--- a/fs/reiserfs/xattr.c
+++ b/fs/reiserfs/xattr.c
--- a/fs/reiserfs/xattr_security.c
+++ b/fs/reiserfs/xattr_security.c
--- a/fs/romfs/super.c
+++ b/fs/romfs/super.c
--- a/fs/squashfs/Makefile
+++ b/fs/squashfs/Makefile
--- a/fs/squashfs/cache.c
+++ b/fs/squashfs/cache.c
--- a/fs/squashfs/super.c
+++ b/fs/squashfs/super.c
--- a/fs/super.c
+++ b/fs/super.c
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
--- a/fs/ubifs/super.c
+++ b/fs/ubifs/super.c
--- a/fs/ufs/dir.c
+++ b/fs/ufs/dir.c
--- a/fs/ufs/file.c
+++ b/fs/ufs/file.c
--- a/fs/ufs/ufs.h
+++ b/fs/ufs/ufs.h