The patch titled Subject: autofs: update fs/autofs4/Kconfig has been added to the -mm tree. Its filename is autofs-update-fs-autofs4-kconfig.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/autofs-update-fs-autofs4-kconfig.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/autofs-update-fs-autofs4-kconfig.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Ian Kent <raven@xxxxxxxxxx> Subject: autofs: update fs/autofs4/Kconfig Update Kconfig and add a depricated warning. Link: http://lkml.kernel.org/r/152626706133.28589.11994171621899212952.stgit@xxxxxxxxxxxxxxxx Signed-off-by: Ian Kent <raven@xxxxxxxxxx> Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/autofs4/Kconfig | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff -puN fs/autofs4/Kconfig~autofs-update-fs-autofs4-kconfig fs/autofs4/Kconfig --- a/fs/autofs4/Kconfig~autofs-update-fs-autofs4-kconfig +++ a/fs/autofs4/Kconfig @@ -1,5 +1,6 @@ config AUTOFS4_FS - tristate "Kernel automounter version 4 support (also supports v3)" + tristate "Kernel automounter version 4 support (also supports v3 and v5)" + default n help The automounter is a tool to automatically mount remote file systems on demand. This implementation is partially kernel-based to reduce @@ -7,14 +8,25 @@ config AUTOFS4_FS automounter (amd), which is a pure user space daemon. To use the automounter you need the user-space tools from - <https://www.kernel.org/pub/linux/daemons/autofs/v4/>; you also - want to answer Y to "NFS file system support", below. + <https://www.kernel.org/pub/linux/daemons/autofs/>; you also want + to answer Y to "NFS file system support", below. - To compile this support as a module, choose M here: the module will be - called autofs4. You will need to add "alias autofs autofs4" to your - modules configuration file. + This module is in the process of being renamed from autofs4 to + autofs. Since autofs is now the only module that provides the + autofs file system the module is not version 4 specific. - If you are not a part of a fairly large, distributed network or - don't have a laptop which needs to dynamically reconfigure to the - local network, you probably do not need an automounter, and can say - N here. + The autofs4 module is now built from the source located in + fs/autofs. The autofs4 directory and its configuration entry + will be removed two kernel versions from the inclusion of this + change. + + Changes that will need to be made should be limited to: + - source include statments should be changed from autofs_fs4.h to + autofs_fs.h since these two header files have been merged. + - user space scripts that manually load autofs4.ko should be + changed to load autofs.ko. But since the module directory name + and the module name are the same as the file system name there + is no need to manually load module. + - any "alias autofs autofs4" will need to be removed. + + Please configure AUTOFS_FS instead of AUTOFS4_FS from now on. _ Patches currently in -mm which might be from raven@xxxxxxxxxx are autofs4-merge-auto_fsh-and-auto_fs4h.patch autofs4-use-autofs-instead-of-autofs4-everywhere.patch autofs-copy-autofs4-to-autofs.patch autofs-create-autofs-kconfig-and-makefile.patch autofs-update-fs-autofs4-kconfig.patch autofs-update-fs-autofs4-makefile.patch autofs-delete-fs-autofs4-source-files.patch autofs-rename-autofs-documentation-files.patch autofs-use-autofs-instead-of-autofs4-in-documentation.patch autofs-update-maintainers-entry-for-autofs.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html