Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
Linus Torvalds [Fri, 27 Mar 2009 23:23:12 +0000 (16:23 -0700)]
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (37 commits)
  fs: avoid I_NEW inodes
  Merge code for single and multiple-instance mounts
  Remove get_init_pts_sb()
  Move common mknod_ptmx() calls into caller
  Parse mount options just once and copy them to super block
  Unroll essentials of do_remount_sb() into devpts
  vfs: simple_set_mnt() should return void
  fs: move bdev code out of buffer.c
  constify dentry_operations: rest
  constify dentry_operations: configfs
  constify dentry_operations: sysfs
  constify dentry_operations: JFS
  constify dentry_operations: OCFS2
  constify dentry_operations: GFS2
  constify dentry_operations: FAT
  constify dentry_operations: FUSE
  constify dentry_operations: procfs
  constify dentry_operations: ecryptfs
  constify dentry_operations: CIFS
  constify dentry_operations: AFS
  ...

15 files changed:
1  2 
arch/mips/kernel/linux32.c
fs/cifs/dir.c
fs/compat.c
fs/gfs2/ops_dentry.c
fs/gfs2/super.h
fs/inode.c
fs/jfs/namei.c
fs/namei.c
fs/namespace.c
fs/pipe.c
fs/quota/dquot.c
fs/super.c
fs/sysfs/dir.c
include/linux/fs.h
net/socket.c

Simple merge
diff --cc fs/cifs/dir.c
Simple merge
diff --cc fs/compat.c
Simple merge
Simple merge
diff --cc fs/gfs2/super.h
Simple merge
diff --cc fs/inode.c
Simple merge
diff --cc fs/jfs/namei.c
Simple merge
diff --cc fs/namei.c
Simple merge
diff --cc fs/namespace.c
Simple merge
diff --cc fs/pipe.c
Simple merge
Simple merge
diff --cc fs/super.c
Simple merge
diff --cc fs/sysfs/dir.c
Simple merge
Simple merge
diff --cc net/socket.c
Simple merge