Merge branch 'linus' into sched/core

Merge reason: we want to queue up dependent cleanup Signed-off-by: Ingo Molnar <mingo@elte.hu>
2026-11-13 07:31:07 +00:00 · 2010-12-08 20:15:26 +01:00 · 2010-12-08 20:15:26 +01:00 · 8e9255e6a2
commit 8e9255e6a2
parent 5091faa449 6313e3c217
658 changed files with 15730 additions and 7427 deletions
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
--- a/fs/btrfs/compression.c
+++ b/fs/btrfs/compression.c
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
--- a/fs/btrfs/export.c
+++ b/fs/btrfs/export.c
--- a/fs/btrfs/extent-tree.c
+++ b/fs/btrfs/extent-tree.c
--- a/fs/btrfs/extent_io.c
+++ b/fs/btrfs/extent_io.c
--- a/fs/btrfs/extent_io.h
+++ b/fs/btrfs/extent_io.h
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
--- a/fs/btrfs/ordered-data.c
+++ b/fs/btrfs/ordered-data.c
--- a/fs/btrfs/ordered-data.h
+++ b/fs/btrfs/ordered-data.h
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
--- a/fs/cifs/Kconfig
+++ b/fs/cifs/Kconfig
--- a/fs/cifs/cifsacl.c
+++ b/fs/cifs/cifsacl.c
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
--- a/fs/cifs/cifsproto.h
+++ b/fs/cifs/cifsproto.h
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
--- a/fs/cifs/dns_resolve.c
+++ b/fs/cifs/dns_resolve.c
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
--- a/fs/cifs/fscache.c
+++ b/fs/cifs/fscache.c
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
--- a/fs/cifs/readdir.c
+++ b/fs/cifs/readdir.c
--- a/fs/cifs/xattr.c
+++ b/fs/cifs/xattr.c
--- a/fs/compat.c
+++ b/fs/compat.c
--- a/fs/exec.c
+++ b/fs/exec.c
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
--- a/fs/ioprio.c
+++ b/fs/ioprio.c
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
--- a/fs/nfs/nfs2xdr.c
+++ b/fs/nfs/nfs2xdr.c
--- a/fs/nfs/nfs3xdr.c
+++ b/fs/nfs/nfs3xdr.c
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
--- a/fs/nilfs2/dat.c
+++ b/fs/nilfs2/dat.c
--- a/fs/nilfs2/ioctl.c
+++ b/fs/nilfs2/ioctl.c
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
--- a/fs/ocfs2/dcache.c
+++ b/fs/ocfs2/dcache.c
--- a/fs/ocfs2/dlm/dlmdomain.c
+++ b/fs/ocfs2/dlm/dlmdomain.c
--- a/fs/ocfs2/ocfs2.h
+++ b/fs/ocfs2/ocfs2.h
--- a/fs/ocfs2/stack_user.c
+++ b/fs/ocfs2/stack_user.c
--- a/fs/pipe.c
+++ b/fs/pipe.c
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
--- a/fs/reiserfs/ioctl.c
+++ b/fs/reiserfs/ioctl.c
--- a/fs/reiserfs/xattr_acl.c
+++ b/fs/reiserfs/xattr_acl.c
--- a/fs/splice.c
+++ b/fs/splice.c
--- a/fs/xfs/linux-2.6/xfs_aops.c
+++ b/fs/xfs/linux-2.6/xfs_aops.c
--- a/fs/xfs/linux-2.6/xfs_buf.c
+++ b/fs/xfs/linux-2.6/xfs_buf.c
--- a/fs/xfs/xfs_bmap.c
+++ b/fs/xfs/xfs_bmap.c
--- a/fs/xfs/xfs_bmap.h
+++ b/fs/xfs/xfs_bmap.h
--- a/fs/xfs/xfs_dfrag.c
+++ b/fs/xfs/xfs_dfrag.c
--- a/fs/xfs/xfs_error.c
+++ b/fs/xfs/xfs_error.c
--- a/fs/xfs/xfs_error.h
+++ b/fs/xfs/xfs_error.h
--- a/fs/xfs/xfs_inode_item.c
+++ b/fs/xfs/xfs_inode_item.c