Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2026-11-13 07:31:07 +00:00 · 2011-12-02 13:49:21 -05:00 · 2011-12-02 13:49:21 -05:00 · b3613118eb
commit b3613118eb
parent 7505afe28c 5983fe2b29
440 changed files with 5778 additions and 3871 deletions
--- a/fs/btrfs/backref.c
+++ b/fs/btrfs/backref.c
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.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/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/free-space-cache.c
+++ b/fs/btrfs/free-space-cache.c
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
--- a/fs/btrfs/scrub.c
+++ b/fs/btrfs/scrub.c
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
--- a/fs/btrfs/transaction.c
+++ b/fs/btrfs/transaction.c
--- a/fs/btrfs/volumes.h
+++ b/fs/btrfs/volumes.h
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
--- a/fs/ceph/super.c
+++ b/fs/ceph/super.c
--- a/fs/dcache.c
+++ b/fs/dcache.c
--- a/fs/ecryptfs/crypto.c
+++ b/fs/ecryptfs/crypto.c
--- a/fs/ecryptfs/ecryptfs_kernel.h
+++ b/fs/ecryptfs/ecryptfs_kernel.h
--- a/fs/ecryptfs/file.c
+++ b/fs/ecryptfs/file.c
--- a/fs/ecryptfs/inode.c
+++ b/fs/ecryptfs/inode.c
--- a/fs/ext4/balloc.c
+++ b/fs/ext4/balloc.c
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
--- a/fs/minix/bitmap.c
+++ b/fs/minix/bitmap.c
--- a/fs/minix/inode.c
+++ b/fs/minix/inode.c
--- a/fs/minix/minix.h
+++ b/fs/minix/minix.h
--- a/fs/namespace.c
+++ b/fs/namespace.c
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
--- a/fs/nfs/nfs3proc.c
+++ b/fs/nfs/nfs3proc.c
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
--- a/fs/nfs/pnfs.c
+++ b/fs/nfs/pnfs.c
--- a/fs/nfs/proc.c
+++ b/fs/nfs/proc.c
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
--- a/fs/ocfs2/alloc.c
+++ b/fs/ocfs2/alloc.c
--- a/fs/ocfs2/aops.c
+++ b/fs/ocfs2/aops.c
--- a/fs/ocfs2/aops.h
+++ b/fs/ocfs2/aops.h
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
--- a/fs/ocfs2/cluster/netdebug.c
+++ b/fs/ocfs2/cluster/netdebug.c
--- a/fs/ocfs2/cluster/tcp.c
+++ b/fs/ocfs2/cluster/tcp.c
--- a/fs/ocfs2/cluster/tcp.h
+++ b/fs/ocfs2/cluster/tcp.h
--- a/fs/ocfs2/dir.c
+++ b/fs/ocfs2/dir.c
--- a/fs/ocfs2/dlm/dlmcommon.h
+++ b/fs/ocfs2/dlm/dlmcommon.h
--- a/fs/ocfs2/dlm/dlmdomain.c
+++ b/fs/ocfs2/dlm/dlmdomain.c
--- a/fs/ocfs2/dlm/dlmlock.c
+++ b/fs/ocfs2/dlm/dlmlock.c
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
--- a/fs/ocfs2/dlm/dlmrecovery.c
+++ b/fs/ocfs2/dlm/dlmrecovery.c
--- a/fs/ocfs2/dlm/dlmthread.c
+++ b/fs/ocfs2/dlm/dlmthread.c
--- a/fs/ocfs2/dlmglue.c
+++ b/fs/ocfs2/dlmglue.c
--- a/fs/ocfs2/extent_map.c
+++ b/fs/ocfs2/extent_map.c
--- a/fs/ocfs2/extent_map.h
+++ b/fs/ocfs2/extent_map.h
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
--- a/fs/ocfs2/inode.c
+++ b/fs/ocfs2/inode.c
--- a/fs/ocfs2/inode.h
+++ b/fs/ocfs2/inode.h
--- a/fs/ocfs2/ioctl.c
+++ b/fs/ocfs2/ioctl.c
--- a/fs/ocfs2/journal.c
+++ b/fs/ocfs2/journal.c
--- a/fs/ocfs2/journal.h
+++ b/fs/ocfs2/journal.h
--- a/fs/ocfs2/mmap.c
+++ b/fs/ocfs2/mmap.c
--- a/fs/ocfs2/move_extents.c
+++ b/fs/ocfs2/move_extents.c
--- a/fs/ocfs2/ocfs2.h
+++ b/fs/ocfs2/ocfs2.h
--- a/fs/ocfs2/quota_local.c
+++ b/fs/ocfs2/quota_local.c
--- a/fs/ocfs2/slot_map.c
+++ b/fs/ocfs2/slot_map.c
--- a/fs/ocfs2/stack_o2cb.c
+++ b/fs/ocfs2/stack_o2cb.c
--- a/fs/ocfs2/super.c
+++ b/fs/ocfs2/super.c
--- a/fs/ocfs2/xattr.c
+++ b/fs/ocfs2/xattr.c
--- a/fs/pstore/platform.c
+++ b/fs/pstore/platform.c