The patch titled
Subject: autofs - make autofs4 Kconfig depend on AUTOFS_FS
has been removed from the -mm tree. Its filename was
autofs-create-autofs-kconfig-and-makefile-fix.patch
This patch was dropped because it was folded into autofs-create-autofs-kconfig-and-makefile.patch
------------------------------------------------------
From: Ian Kent <raven@xxxxxxxxxx>
Subject: autofs - make autofs4 Kconfig depend on AUTOFS_FS
Setting AUTOFS_FS and AUTOFS4_FS to y or m results in a compile failure.
It isn't possible to unset one if the other is set because it introduces a
circular dependency.
But adding "depends on AUTOFS_FS = n" will make autofs4 appear under the
autofs entry which should call attention to it. It also results in
AUTOFS4_FS being removed from .config for any setting of AUTOFS_FS except
n.
Adding a "NOTE" to the AUTOFS4_FS help text will hopefully raise awareness
of the change to smooth the transition.
Link: http://lkml.kernel.org/r/152687649097.8263.7046086367407522029.stgit@xxxxxxxxxxxxxxxx
Signed-off-by: Ian Kent <raven@xxxxxxxxxx>
Reported-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Tested-by: Randy Dunlap <rdunlap@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/autofs4/Kconfig | 8 ++++++++
1 file changed, 8 insertions(+)
diff -puN fs/autofs4/Kconfig~autofs-create-autofs-kconfig-and-makefile-fix fs/autofs4/Kconfig
--- a/fs/autofs4/Kconfig~autofs-create-autofs-kconfig-and-makefile-fix
+++ a/fs/autofs4/Kconfig
@@ -1,6 +1,7 @@
config AUTOFS4_FS
tristate "Kernel automounter version 4 support (also supports v3 and v5)"
default n
+ depends on AUTOFS_FS = n
help
The automounter is a tool to automatically mount remote file systems
on demand. This implementation is partially kernel-based to reduce
@@ -30,3 +31,10 @@ config AUTOFS4_FS
- any "alias autofs autofs4" will need to be removed.
Please configure AUTOFS_FS instead of AUTOFS4_FS from now on.
+
+ NOTE: Since the modules autofs and autofs4 use the same file system
+ type name of "autofs" only one can be built. The "depends"
+ above will result in AUTOFS4_FS not appearing in .config for
+ any setting of AUTOFS_FS other than n and AUTOFS4_FS will
+ appear under the AUTOFS_FS entry otherwise which is intended
+ to draw attention to the module rename change.
_
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-update-fs-autofs4-kconfig.patch
autofs-update-fs-autofs4-makefile.patch
autofs-delete-fs-autofs4-source-files.patch
autofs-create-autofs-kconfig-and-makefile.patch
autofs-rename-autofs-documentation-files.patch
autofs-use-autofs-instead-of-autofs4-in-documentation.patch
autofs-update-maintainers-entry-for-autofs.patch
autofs-comment-on-selinux-changes-needed-for-module-autoload.patch
autofs-clean-up-includes.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
