github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-10-31 02:13:29 +00:00
Code Issues Projects Releases Wiki Activity

kernel: Move KEYS_COMPAT

Browse Source 
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 <rolf.neugebauer@docker.com>
This commit is contained in:
Rolf Neugebauer
2017-11-21 14:59:44 +00:00
parent f5e970b7fb
commit 57226034e6
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/config-4.4.x-x86_64
View File

@@ -704,7 +704,6 @@ CONFIG_IA32_EMULATION=y
CONFIG_COMPAT=y CONFIG_COMPAT=y
CONFIG_COMPAT_FOR_U64_ALIGNMENT=y CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
CONFIG_SYSVIPC_COMPAT=y CONFIG_SYSVIPC_COMPAT=y
CONFIG_KEYS_COMPAT=y
CONFIG_X86_DEV_DMA_OPS=y CONFIG_X86_DEV_DMA_OPS=y
CONFIG_PMC_ATOM=y CONFIG_PMC_ATOM=y
CONFIG_NET=y CONFIG_NET=y
@@ -3437,6 +3436,7 @@ CONFIG_X86_DEBUG_FPU=y
# Security options # Security options
# #
CONFIG_KEYS=y CONFIG_KEYS=y
CONFIG_KEYS_COMPAT=y
CONFIG_PERSISTENT_KEYRINGS=y CONFIG_PERSISTENT_KEYRINGS=y
CONFIG_BIG_KEYS=y CONFIG_BIG_KEYS=y
# CONFIG_TRUSTED_KEYS is not set # CONFIG_TRUSTED_KEYS is not set

2
kernel/config-4.9.x-x86_64
View File

@@ -761,7 +761,6 @@ CONFIG_IA32_EMULATION=y
CONFIG_COMPAT=y CONFIG_COMPAT=y
CONFIG_COMPAT_FOR_U64_ALIGNMENT=y CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
CONFIG_SYSVIPC_COMPAT=y CONFIG_SYSVIPC_COMPAT=y
CONFIG_KEYS_COMPAT=y
CONFIG_X86_DEV_DMA_OPS=y CONFIG_X86_DEV_DMA_OPS=y
CONFIG_PMC_ATOM=y CONFIG_PMC_ATOM=y
CONFIG_NET=y CONFIG_NET=y
@@ -3631,6 +3630,7 @@ CONFIG_X86_DEBUG_FPU=y
# Security options # Security options
# #
CONFIG_KEYS=y CONFIG_KEYS=y
CONFIG_KEYS_COMPAT=y
CONFIG_PERSISTENT_KEYRINGS=y CONFIG_PERSISTENT_KEYRINGS=y
CONFIG_BIG_KEYS=y CONFIG_BIG_KEYS=y
CONFIG_TRUSTED_KEYS=m CONFIG_TRUSTED_KEYS=m