From: Linus Torvalds Date: Fri, 18 Mar 2011 17:51:11 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 X-Git-Tag: 2.1b_release~4972 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f539abece1b7e36fae6add4f9ea29203d40badcb;p=platform%2Fkernel%2Fkernel-mfld-blackbay.git Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: fs: call security_d_instantiate in d_obtain_alias V2 lose 'mounting_here' argument in ->d_manage() don't pass 'mounting_here' flag to follow_down() change the locking order for namespace_sem fix deadlock in pivot_root() vfs: split off vfsmount-related parts of vfs_kern_mount() Some fixes for pstore kill simple_set_mnt() --- f539abece1b7e36fae6add4f9ea29203d40badcb