Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Linus Torvalds [Wed, 21 Mar 2012 20:36:41 +0000 (13:36 -0700)]
Pull vfs pile 1 from Al Viro:
 "This is _not_ all; in particular, Miklos' and Jan's stuff is not there
  yet."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (64 commits)
  ext4: initialization of ext4_li_mtx needs to be done earlier
  debugfs-related mode_t whack-a-mole
  hfsplus: add an ioctl to bless files
  hfsplus: change finder_info to u32
  hfsplus: initialise userflags
  qnx4: new helper - try_extent()
  qnx4: get rid of qnx4_bread/qnx4_getblk
  take removal of PF_FORKNOEXEC to flush_old_exec()
  trim includes in inode.c
  um: uml_dup_mmap() relies on ->mmap_sem being held, but activate_mm() doesn't hold it
  um: embed ->stub_pages[] into mmu_context
  gadgetfs: list_for_each_safe() misuse
  ocfs2: fix leaks on failure exits in module_init
  ecryptfs: make register_filesystem() the last potential failure exit
  ntfs: forgets to unregister sysctls on register_filesystem() failure
  logfs: missing cleanup on register_filesystem() failure
  jfs: mising cleanup on register_filesystem() failure
  make configfs_pin_fs() return root dentry on success
  configfs: configfs_create_dir() has parent dentry in dentry->d_parent
  configfs: sanitize configfs_create()
  ...

23 files changed:
1  2 
Documentation/filesystems/debugfs.txt
Documentation/ioctl/ioctl-number.txt
drivers/net/ethernet/brocade/bna/bnad_debugfs.c
drivers/usb/gadget/f_fs.c
drivers/usb/gadget/inode.c
fs/Kconfig
fs/aio.c
fs/cramfs/inode.c
fs/dcache.c
fs/devpts/inode.c
fs/exec.c
fs/logfs/dir.c
fs/namei.c
fs/ntfs/super.c
fs/reiserfs/lbalance.c
fs/reiserfs/stree.c
fs/reiserfs/tail_conversion.c
fs/sysfs/mount.c
kernel/cgroup.c
kernel/trace/trace_output.c
mm/shmem.c
net/unix/af_unix.c
net/unix/diag.c

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/Kconfig
Simple merge
diff --cc fs/aio.c
Simple merge
Simple merge
diff --cc fs/dcache.c
Simple merge
Simple merge
diff --cc fs/exec.c
Simple merge
diff --cc fs/logfs/dir.c
Simple merge
diff --cc fs/namei.c
Simple merge
diff --cc fs/ntfs/super.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/cgroup.c
Simple merge
Simple merge
diff --cc mm/shmem.c
Simple merge
Simple merge
diff --cc net/unix/diag.c
Simple merge