| commit | f539abece1b7e36fae6add4f9ea29203d40badcb | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 18 10:51:11 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Mar 18 10:51:11 2011 -0700 |
| tree | 786c08f3131a1871ece13343c3fa3832930c1408 | |
| parent | 3f6f7e6d57b8a0ae2810ae7aac70c51b6f2a6304 [diff] | |
| parent | 24ff6663ccfdaf088dfa7acae489cb11ed4f43c4 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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()