diff options
| author | James Morris <james.l.morris@oracle.com> | 2016-03-04 11:39:53 +1100 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2016-03-04 11:39:53 +1100 |
| commit | 88a1b564a20e371e6be41b39b85673e9c1959491 (patch) | |
| tree | f70850f5242470d479711ddb816ac05f47b15642 /arch/x86/configs | |
| parent | 5804602536649bccc907cbdd7e31b8797bdb6c45 (diff) | |
| parent | 4e8ae72a75aae285ec5b93518b9680da198afd0d (diff) | |
| download | blackbird-op-linux-88a1b564a20e371e6be41b39b85673e9c1959491.tar.gz blackbird-op-linux-88a1b564a20e371e6be41b39b85673e9c1959491.zip | |
Merge tag 'keys-next-20160303' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next
Diffstat (limited to 'arch/x86/configs')
| -rw-r--r-- | arch/x86/configs/i386_defconfig | 1 | ||||
| -rw-r--r-- | arch/x86/configs/x86_64_defconfig | 1 |
2 files changed, 0 insertions, 2 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 diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig index cb5b3ab5beec..4f404a64681b 100644 --- a/arch/x86/configs/x86_64_defconfig +++ b/arch/x86/configs/x86_64_defconfig @@ -300,7 +300,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 |
