From 8a9007fe45fffa57ff630f38491007e049928645 Mon Sep 17 00:00:00 2001 From: Jianyong Wu Date: Thu, 16 Dec 2021 14:34:35 +0800 Subject: [PATCH] config: remove 2 config as they are removed in 5.15 I'm sure that it is correct to remove CONFIG_ARM64_UAO and CONFIG_MANDATORY_FILE_LOCKING and . Both are gone in 5.15. Maintain a specific config files for a kernel version is a little ugly. If someone needs them, shout at me. Fixes: #3280 Signed-off-by: Jianyong Wu --- tools/packaging/kernel/configs/fragments/arm64/base.conf | 1 - .../kernel/configs/fragments/build-type/arm-experimental/no.conf | 0 tools/packaging/kernel/configs/fragments/common/fs.conf | 1 - 3 files changed, 2 deletions(-) create mode 100644 tools/packaging/kernel/configs/fragments/build-type/arm-experimental/no.conf diff --git a/tools/packaging/kernel/configs/fragments/arm64/base.conf b/tools/packaging/kernel/configs/fragments/arm64/base.conf index 5ce4ac8c8..b5202d876 100644 --- a/tools/packaging/kernel/configs/fragments/arm64/base.conf +++ b/tools/packaging/kernel/configs/fragments/arm64/base.conf @@ -37,7 +37,6 @@ CONFIG_ARM64_PAN=y CONFIG_ARM64_CNP=y CONFIG_ARM64_PMEM=y CONFIG_ARM64_RAS_EXTN=y -CONFIG_ARM64_UAO=y # end of ARMv8.2 architectural feature CONFIG_NO_HZ_FULL=y diff --git a/tools/packaging/kernel/configs/fragments/build-type/arm-experimental/no.conf b/tools/packaging/kernel/configs/fragments/build-type/arm-experimental/no.conf new file mode 100644 index 000000000..e69de29bb diff --git a/tools/packaging/kernel/configs/fragments/common/fs.conf b/tools/packaging/kernel/configs/fragments/common/fs.conf index 4a702e092..ae4e3255f 100644 --- a/tools/packaging/kernel/configs/fragments/common/fs.conf +++ b/tools/packaging/kernel/configs/fragments/common/fs.conf @@ -26,7 +26,6 @@ CONFIG_FS_POSIX_ACL=y CONFIG_EXPORTFS=y CONFIG_EXPORTFS_BLOCK_OPS=y CONFIG_FILE_LOCKING=y -CONFIG_MANDATORY_FILE_LOCKING=y # A bunch of these are required for systemd at least. CONFIG_FSNOTIFY=y CONFIG_DNOTIFY=y