[openwrt/openwrt] kernel: update and clean kernel keyring options

[LEDE Commits]

dangole pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/7b85dd3788fd427ae95c6029b7a9177fd379ffea

commit 7b85dd3788fd427ae95c6029b7a9177fd379ffea
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Wed Dec 9 12:28:31 2020 +0000

    kernel: update and clean kernel keyring options
    
    Add KERNEL_KEYS_REQUEST_CACHE option.
    'tristate' (ie. module builds) are not valid in Config-kernel.in, hence
    remove tristate KERNEL_ENCRYPTED_KEYS. It will be readded as a kernel
    module in a follow-up commit.
    
    Fixes: 39d817cf38 ("Add config symbols for kernel keyring support")
    Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
 config/Config-kernel.in | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index 1cd9da4d12..b5eba78719 100644
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -531,23 +531,23 @@ if KERNEL_DEVTMPFS
 endif
 
 config KERNEL_KEYS
-    bool "Enable kernel access key retention support"
-    default n
+	bool "Enable kernel access key retention support"
+	default n
 
 config KERNEL_PERSISTENT_KEYRINGS
-    bool "Enable kernel persistent keyrings"
-    depends on KERNEL_KEYS
-    default n
+	bool "Enable kernel persistent keyrings"
+	depends on KERNEL_KEYS
+	default n
+
+config KERNEL_KEYS_REQUEST_CACHE
+	bool "Enable temporary caching of the last request_key() result"
+	depends on KERNEL_KEYS
+	default n
 
 config KERNEL_BIG_KEYS
-    bool "Enable large payload keys on kernel keyrings"
-    depends on KERNEL_KEYS
-    default n
-
-config KERNEL_ENCRYPTED_KEYS
-    tristate "Enable keys with encrypted payloads on kernel keyrings"
-    depends on KERNEL_KEYS
-    default n
+	bool "Enable large payload keys on kernel keyrings"
+	depends on KERNEL_KEYS
+	default n
 
 #
 # CGROUP support symbols