The patch titled
Subject: autofs: make autofs4 and autofs mutually exclusive
has been removed from the -mm tree. Its filename was
autofs-update-fs-autofs4-kconfig-fix-2.patch
This patch was dropped because it is obsolete
------------------------------------------------------
From: Arnd Bergmann <arnd@xxxxxxxx>
Subject: autofs: make autofs4 and autofs mutually exclusive
The autofs4 implementation is just a redirect to autofs now, but that
also means we can't have both built into the same kernel:
fs/autofs/inode.o: In function `autofs_new_ino':
inode.c:(.text+0x1b8): multiple definition of `autofs_new_ino'
fs/autofs/inode.o:inode.c:(.text+0x1b8): first defined here
fs/autofs/inode.o: In function `autofs_clean_ino':
inode.c:(.text+0x288): multiple definition of `autofs_clean_ino'
There is also a problem with trying to build both in parallel, which
leads to two 'make' processes writing to the same fs/autofs/.*.o.cmd
file, causing corruption that manifests like
fs/autofs4/../autofs/.expire.o.cmd:679: *** missing separator. Stop.
Making AUTOFS4_FS depend on AUTOFS_FS being disabled should avoid all
configurations that run into either issue.
Link: http://lkml.kernel.org/r/20180529094702.4092022-1-arnd@xxxxxxxx
Fixes: mmotm ("autofs: update fs/autofs4/Makefile")
Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Ian Kent <raven@xxxxxxxxxx>
Cc: Mark Brown <broonie@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/autofs4/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff -puN fs/autofs4/Kconfig~autofs-update-fs-autofs4-kconfig-fix-2 fs/autofs4/Kconfig
--- a/fs/autofs4/Kconfig~autofs-update-fs-autofs4-kconfig-fix-2
+++ a/fs/autofs4/Kconfig
@@ -1,5 +1,6 @@
config AUTOFS4_FS
tristate "Kernel automounter version 4 support (also supports v3 and v5)"
+ depends on AUTOFS_FS=n
default n
depends on AUTOFS_FS = n
help
_
Patches currently in -mm which might be from arnd@xxxxxxxx are
--
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
