diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-16 19:24:44 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-16 19:24:44 +0100 |
| commit | 9a19a6db37ee0b7a6db796b3dcd6bb6e7237d6ea (patch) | |
| tree | 614d68498eea1c6f9120cae07806f916fd9776bc /fs/Kconfig | |
| parent | Merge tag 'media/v4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mc... (diff) | |
| parent | Merge branches 'work.namei', 'work.dcache' and 'work.iov_iter' into for-linus (diff) | |
| download | linux-9a19a6db37ee0b7a6db796b3dcd6bb6e7237d6ea.tar.xz linux-9a19a6db37ee0b7a6db796b3dcd6bb6e7237d6ea.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs updates from Al Viro:
- more ->d_init() stuff (work.dcache)
- pathname resolution cleanups (work.namei)
- a few missing iov_iter primitives - copy_from_iter_full() and
friends. Either copy the full requested amount, advance the iterator
and return true, or fail, return false and do _not_ advance the
iterator. Quite a few open-coded callers converted (and became more
readable and harder to fuck up that way) (work.iov_iter)
- several assorted patches, the big one being logfs removal
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
logfs: remove from tree
vfs: fix put_compat_statfs64() does not handle errors
namei: fold should_follow_link() with the step into not-followed link
namei: pass both WALK_GET and WALK_MORE to should_follow_link()
namei: invert WALK_PUT logics
namei: shift interpretation of LOOKUP_FOLLOW inside should_follow_link()
namei: saner calling conventions for mountpoint_last()
namei.c: get rid of user_path_parent()
switch getfrag callbacks to ..._full() primitives
make skb_add_data,{_nocache}() and skb_copy_to_page_nocache() advance only on success
[iov_iter] new primitives - copy_from_iter_full() and friends
don't open-code file_inode()
ceph: switch to use of ->d_init()
ceph: unify dentry_operations instances
lustre: switch to use of ->d_init()
Diffstat (limited to 'fs/Kconfig')
| -rw-r--r-- | fs/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/Kconfig b/fs/Kconfig index 8e9e5f4104f4..c2a377cdda2b 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -234,7 +234,6 @@ source "fs/efs/Kconfig" source "fs/jffs2/Kconfig" # UBIFS File system configuration source "fs/ubifs/Kconfig" -source "fs/logfs/Kconfig" source "fs/cramfs/Kconfig" source "fs/squashfs/Kconfig" source "fs/freevxfs/Kconfig" |