The patch titled Subject: revert autofs-update-fs-autofs4-kconfig-fix has been added to the -mm tree. Its filename is revert-autofs-update-fs-autofs4-kconfig-fix.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/revert-autofs-update-fs-autofs4-kconfig-fix.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/revert-autofs-update-fs-autofs4-kconfig-fix.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: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Subject: revert autofs-update-fs-autofs4-kconfig-fix Cc: Ian Kent <raven@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/autofs4/Kconfig | 8 -------- 1 file changed, 8 deletions(-) diff -puN fs/autofs4/Kconfig~revert-autofs-update-fs-autofs4-kconfig-fix fs/autofs4/Kconfig --- a/fs/autofs4/Kconfig~revert-autofs-update-fs-autofs4-kconfig-fix +++ a/fs/autofs4/Kconfig @@ -1,7 +1,6 @@ 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 @@ -31,10 +30,3 @@ 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 akpm@xxxxxxxxxxxxxxxxxxxx are i-need-old-gcc.patch mm-fix-race-between-kmem_cache-destroy-create-and-deactivate-v2-fix.patch arm-arch-arm-include-asm-pageh-needs-personalityh.patch ocfs2-without-quota-support-try-to-avoid-calling-quota-recovery-checkpatch-fixes.patch mm.patch zram-introduce-zram-memory-tracking-fix.patch zram-introduce-zram-memory-tracking-update-fix.patch zram-introduce-zram-memory-tracking-update-fix-fix.patch mm-check-for-sigkill-inside-dup_mmap-loop-fix.patch mm-vmalloc-pass-proper-vm_start-into-debugobjects-fix.patch mm-shmem-make-statst_blksize-return-huge-page-size-if-thp-is-on-fix.patch mm-ksm-move-page_stable_node-from-ksmh-to-ksmc-fix.patch list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch mm-oom-cgroup-aware-oom-killer-fix.patch mm-oom-cgroup-aware-oom-killer-fix-2.patch mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch mm-oom-cgroup-aware-oom-killer-fix-fix.patch proc-simpler-iterations-for-proc-cmdline-fix.patch revert-autofs-update-fs-autofs4-kconfig-fix.patch kcov-prefault-the-kcov_area-fix.patch kcov-prefault-the-kcov_area-fix-fix.patch kcov-prefault-the-kcov_area-fix-fix-fix.patch linux-next-rejects.patch kernel-forkc-export-kernel_thread-to-modules.patch slab-leaks3-default-y.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