diff options
| author | David Howells <dhowells@redhat.com> | 2016-02-03 16:04:40 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2016-02-10 11:13:27 +0100 |
| commit | 50d35015ff0c00a464e35b109231145d2beec1bd (patch) | |
| tree | 65b3adb01534e964eca9d8cdd49420c0e7f87c17 /arch/x86/configs/i386_defconfig | |
| parent | KEYS: Add an alloc flag to convey the builtinness of a key (diff) | |
| download | linux-50d35015ff0c00a464e35b109231145d2beec1bd.tar.xz linux-50d35015ff0c00a464e35b109231145d2beec1bd.zip | |
KEYS: CONFIG_KEYS_DEBUG_PROC_KEYS is no longer an option
CONFIG_KEYS_DEBUG_PROC_KEYS is no longer an option as /proc/keys is now
mandatory if the keyrings facility is enabled (it's used by libkeyutils in
userspace).
The defconfig references were removed with:
perl -p -i -e 's/CONFIG_KEYS_DEBUG_PROC_KEYS=y\n//' \
`git grep -l CONFIG_KEYS_DEBUG_PROC_KEYS=y`
and the integrity Kconfig fixed by hand.
Signed-off-by: David Howells <dhowells@redhat.com>
cc: Andreas Ziegler <andreas.ziegler@fau.de>
cc: Dmitry Kasatkin <dmitry.kasatkin@huawei.com>
Diffstat (limited to 'arch/x86/configs/i386_defconfig')
| -rw-r--r-- | arch/x86/configs/i386_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig index 028be48c8839..a212b68a4909 100644 --- a/arch/x86/configs/i386_defconfig +++ b/arch/x86/configs/i386_defconfig @@ -303,7 +303,6 @@ CONFIG_DEBUG_STACKOVERFLOW=y # CONFIG_DEBUG_RODATA_TEST is not set CONFIG_DEBUG_BOOT_PARAMS=y CONFIG_OPTIMIZE_INLINING=y -CONFIG_KEYS_DEBUG_PROC_KEYS=y CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_SELINUX=y |