From 57226034e6cd85da67c311d3ec788299892f53d1 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Tue, 21 Nov 2017 14:59:44 +0000 Subject: [PATCH] kernel: Move KEYS_COMPAT Commit 31c8c4942820 ("security/keys: add CONFIG_KEYS_COMPAT to Kconfig") moved the KEYS_COMPAT config option to a different section. Adjust config file. Signed-off-by: Rolf Neugebauer --- kernel/config-4.4.x-x86_64 | 2 +- kernel/config-4.9.x-x86_64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/config-4.4.x-x86_64 b/kernel/config-4.4.x-x86_64 index 92a74f8b8..ab1bd0616 100644 --- a/kernel/config-4.4.x-x86_64 +++ b/kernel/config-4.4.x-x86_64 @@ -704,7 +704,6 @@ CONFIG_IA32_EMULATION=y CONFIG_COMPAT=y CONFIG_COMPAT_FOR_U64_ALIGNMENT=y CONFIG_SYSVIPC_COMPAT=y -CONFIG_KEYS_COMPAT=y CONFIG_X86_DEV_DMA_OPS=y CONFIG_PMC_ATOM=y CONFIG_NET=y @@ -3437,6 +3436,7 @@ CONFIG_X86_DEBUG_FPU=y # Security options # CONFIG_KEYS=y +CONFIG_KEYS_COMPAT=y CONFIG_PERSISTENT_KEYRINGS=y CONFIG_BIG_KEYS=y # CONFIG_TRUSTED_KEYS is not set diff --git a/kernel/config-4.9.x-x86_64 b/kernel/config-4.9.x-x86_64 index a54b2f0ad..c4f50ffd1 100644 --- a/kernel/config-4.9.x-x86_64 +++ b/kernel/config-4.9.x-x86_64 @@ -761,7 +761,6 @@ CONFIG_IA32_EMULATION=y CONFIG_COMPAT=y CONFIG_COMPAT_FOR_U64_ALIGNMENT=y CONFIG_SYSVIPC_COMPAT=y -CONFIG_KEYS_COMPAT=y CONFIG_X86_DEV_DMA_OPS=y CONFIG_PMC_ATOM=y CONFIG_NET=y @@ -3631,6 +3630,7 @@ CONFIG_X86_DEBUG_FPU=y # Security options # CONFIG_KEYS=y +CONFIG_KEYS_COMPAT=y CONFIG_PERSISTENT_KEYRINGS=y CONFIG_BIG_KEYS=y CONFIG_TRUSTED_KEYS=m