diff options
| author | Linus Torvalds <[email protected]> | 2013-07-09 18:26:44 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2013-07-09 18:26:44 +0000 |
| commit | c75e24752c0c87938a5955d9056dfb83e8352206 (patch) | |
| tree | a96cec700059896e6b6567be324de63597b3b627 /security/selinux/hooks.c | |
| parent | Merge branch 'for-linus' of git://git.infradead.org/users/vkoul/slave-dma (diff) | |
| parent | ncpfs: fix error return code in ncp_parse_options() (diff) | |
| download | kernel-c75e24752c0c87938a5955d9056dfb83e8352206.tar.gz kernel-c75e24752c0c87938a5955d9056dfb83e8352206.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull third set of VFS updates from Al Viro:
"Misc stuff all over the place. There will be one more pile in a
couple of days"
This is an "evil merge" that also uses the new d_count helper in
fs/configfs/dir.c, missed by commit 84d08fa888e7 ("helper for reading
->d_count")
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
ncpfs: fix error return code in ncp_parse_options()
locks: move file_lock_list to a set of percpu hlist_heads and convert file_lock_lock to an lglock
seq_file: add seq_list_*_percpu helpers
f2fs: fix readdir incorrectness
mode_t whack-a-mole...
lustre: kill the pointless wrapper
helper for reading ->d_count
Diffstat (limited to 'security/selinux/hooks.c')
0 files changed, 0 insertions, 0 deletions