diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-11-20 12:03:06 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-11-20 12:03:06 +0800 |
| commit | ffd95f430f715eb4b86e158a4cff2db55e0d86f8 (patch) | |
| tree | d21ec8ebc71e0c7ce16db0757d4f3bcb006dfd74 /security | |
| parent | d983367513927b1e964689c3686255301f9f1c16 (diff) | |
| parent | 0cbac004e67307949714c176c8a7af9c1da980b9 (diff) | |
Merge tag 'v4.4.99' into linux-linaro-lsk-v4.4
This is the 4.4.99 stable release
Diffstat (limited to 'security')
| -rw-r--r-- | security/keys/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/security/keys/Kconfig b/security/keys/Kconfig index 72483b8f1be5..1edb37eea81d 100644 --- a/security/keys/Kconfig +++ b/security/keys/Kconfig @@ -20,6 +20,10 @@ config KEYS If you are unsure as to whether this is required, answer N. +config KEYS_COMPAT + def_bool y + depends on COMPAT && KEYS + config PERSISTENT_KEYRINGS bool "Enable register of persistent per-UID keyrings" depends on KEYS |