From f213493d81dbe1fcceb96199e1ca1d48ad0f3975 Mon Sep 17 00:00:00 2001 From: Robert Nelson <robertcnelson@gmail.com> Date: Thu, 11 Aug 2022 15:39:01 -0500 Subject: [PATCH] merge: aufs-kbuild Signed-off-by: Robert Nelson <robertcnelson@gmail.com> --- fs/Kconfig | 1 + fs/Makefile | 1 + 2 files changed, 2 insertions(+) diff --git a/fs/Kconfig b/fs/Kconfig index da524c4d7b7e0..50ab89368c2b5 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -288,6 +288,7 @@ source "fs/sysv/Kconfig" source "fs/ufs/Kconfig" source "fs/erofs/Kconfig" source "fs/vboxsf/Kconfig" +source "fs/aufs/Kconfig" endif # MISC_FILESYSTEMS diff --git a/fs/Makefile b/fs/Makefile index 999d1a23f036c..0cd76857ca764 100644 --- a/fs/Makefile +++ b/fs/Makefile @@ -136,3 +136,4 @@ obj-$(CONFIG_EFIVAR_FS) += efivarfs/ obj-$(CONFIG_EROFS_FS) += erofs/ obj-$(CONFIG_VBOXSF_FS) += vboxsf/ obj-$(CONFIG_ZONEFS_FS) += zonefs/ +obj-$(CONFIG_AUFS_FS) += aufs/ -- GitLab