[PATCH 3/5] configs: remove two Kconfig symbols

Commit e21e52b60843 ("Linux v5.3-13236-g97f9a3c4eee5") forgot to remove CONFIG_LOCK_DOWN_KERNEL and CONFIG_LOCK_DOWN_KERNEL_FORCE from the configs/ directory. Do so now. Signed-off-by: Paul Bolle <pebolle(a)tiscali.nl&gt; --- configs/fedora/generic/CONFIG_LOCK_DOWN_KERNEL | 1 - configs/fedora/generic/x86/CONFIG_LOCK_DOWN_KERNEL | 1 - configs/fedora/generic/x86/CONFIG_LOCK_DOWN_KERNEL_FORCE | 1 - kernel-aarch64-debug.config | 1 - kernel-aarch64.config | 1 - kernel-armv7hl-debug.config | 1 - kernel-armv7hl-lpae-debug.config | 1 - kernel-armv7hl-lpae.config | 1 - kernel-armv7hl.config | 1 - kernel-i686-debug.config | 2 -- kernel-i686.config | 2 -- kernel-ppc64le-debug.config | 1 - kernel-ppc64le.config | 1 - kernel-s390x-debug.config | 1 - kernel-s390x.config | 1 - kernel-x86_64-debug.config | 2 -- kernel-x86_64.config | 2 -- 17 files changed, 21 deletions(-) delete mode 100644 configs/fedora/generic/CONFIG_LOCK_DOWN_KERNEL delete mode 100644 configs/fedora/generic/x86/CONFIG_LOCK_DOWN_KERNEL delete mode 100644 configs/fedora/generic/x86/CONFIG_LOCK_DOWN_KERNEL_FORCE diff --git a/configs/fedora/generic/CONFIG_LOCK_DOWN_KERNEL b/configs/fedora/generic/CONFIG_LOCK_DOWN_KERNEL deleted file mode 100644 index c22c35ff2a67..000000000000 --- a/configs/fedora/generic/CONFIG_LOCK_DOWN_KERNEL +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_LOCK_DOWN_KERNEL is not set diff --git a/configs/fedora/generic/x86/CONFIG_LOCK_DOWN_KERNEL b/configs/fedora/generic/x86/CONFIG_LOCK_DOWN_KERNEL deleted file mode 100644 index e99bff22d612..000000000000 --- a/configs/fedora/generic/x86/CONFIG_LOCK_DOWN_KERNEL +++ /dev/null @@ -1 +0,0 @@ -CONFIG_LOCK_DOWN_KERNEL=y diff --git a/configs/fedora/generic/x86/CONFIG_LOCK_DOWN_KERNEL_FORCE b/configs/fedora/generic/x86/CONFIG_LOCK_DOWN_KERNEL_FORCE deleted file mode 100644 index b6a333ecd88a..000000000000 --- a/configs/fedora/generic/x86/CONFIG_LOCK_DOWN_KERNEL_FORCE +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_LOCK_DOWN_KERNEL_FORCE is not set diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config index 44da679a3b12..34b47f81adc8 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -3123,7 +3123,6 @@ CONFIG_LOCKD=m # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y -# CONFIG_LOCK_DOWN_KERNEL is not set CONFIG_LOCKD_V4=y CONFIG_LOCK_EVENT_COUNTS=y # CONFIG_LOCK_STAT is not set diff --git a/kernel-aarch64.config b/kernel-aarch64.config index ace468e3bf36..de224dc88490 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -3105,7 +3105,6 @@ CONFIG_LOCKD=m # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y -# CONFIG_LOCK_DOWN_KERNEL is not set CONFIG_LOCKD_V4=y # CONFIG_LOCK_EVENT_COUNTS is not set # CONFIG_LOCK_STAT is not set diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config index de56267d6efb..f6fd9cc61aff 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -3158,7 +3158,6 @@ CONFIG_LOCKD=m # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y -# CONFIG_LOCK_DOWN_KERNEL is not set CONFIG_LOCKD_V4=y CONFIG_LOCK_EVENT_COUNTS=y # CONFIG_LOCK_STAT is not set diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config index 0801033f79a9..2d61e9454e68 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -3062,7 +3062,6 @@ CONFIG_LOCKD=m # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y -# CONFIG_LOCK_DOWN_KERNEL is not set CONFIG_LOCKD_V4=y CONFIG_LOCK_EVENT_COUNTS=y # CONFIG_LOCK_STAT is not set diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config index 2cf220995712..534b0b4d89c4 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -3045,7 +3045,6 @@ CONFIG_LOCKD=m # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y -# CONFIG_LOCK_DOWN_KERNEL is not set CONFIG_LOCKD_V4=y # CONFIG_LOCK_EVENT_COUNTS is not set # CONFIG_LOCK_STAT is not set diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config index 3559e6e6a9f4..8046280a6d79 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -3141,7 +3141,6 @@ CONFIG_LOCKD=m # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y -# CONFIG_LOCK_DOWN_KERNEL is not set CONFIG_LOCKD_V4=y # CONFIG_LOCK_EVENT_COUNTS is not set # CONFIG_LOCK_STAT is not set diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config index 8b35db4a4a29..f13215d75167 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -2865,9 +2865,7 @@ CONFIG_LOCKD=m # CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT is not set # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set -# CONFIG_LOCK_DOWN_KERNEL_FORCE is not set CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y -CONFIG_LOCK_DOWN_KERNEL=y CONFIG_LOCKD_V4=y CONFIG_LOCK_EVENT_COUNTS=y CONFIG_LOCK_STAT=y diff --git a/kernel-i686.config b/kernel-i686.config index 9cf43b0af157..606397a46678 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -2846,9 +2846,7 @@ CONFIG_LOCKD=m # CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT is not set # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set -# CONFIG_LOCK_DOWN_KERNEL_FORCE is not set CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y -CONFIG_LOCK_DOWN_KERNEL=y CONFIG_LOCKD_V4=y # CONFIG_LOCK_EVENT_COUNTS is not set # CONFIG_LOCK_STAT is not set diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config index 6aec4ec74ad2..abcb8ebc3129 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -2620,7 +2620,6 @@ CONFIG_LOCKD=m # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y -# CONFIG_LOCK_DOWN_KERNEL is not set CONFIG_LOCKD_V4=y CONFIG_LOCK_EVENT_COUNTS=y CONFIG_LOCK_STAT=y diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config index df5c7cb0c267..eae484c73b84 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -2601,7 +2601,6 @@ CONFIG_LOCKD=m # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y -# CONFIG_LOCK_DOWN_KERNEL is not set CONFIG_LOCKD_V4=y # CONFIG_LOCK_EVENT_COUNTS is not set # CONFIG_LOCK_STAT is not set diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config index 2900a16246a8..b84a5a05bf22 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -2597,7 +2597,6 @@ CONFIG_LOCKD=m # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y -# CONFIG_LOCK_DOWN_KERNEL is not set CONFIG_LOCKD_V4=y CONFIG_LOCK_EVENT_COUNTS=y CONFIG_LOCK_STAT=y diff --git a/kernel-s390x.config b/kernel-s390x.config index 6c3b82f09888..0b1dc6fa033e 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -2578,7 +2578,6 @@ CONFIG_LOCKD=m # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y -# CONFIG_LOCK_DOWN_KERNEL is not set CONFIG_LOCKD_V4=y # CONFIG_LOCK_EVENT_COUNTS is not set # CONFIG_LOCK_STAT is not set diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config index 65b34ff0ac98..1ff34277a0c8 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -2922,9 +2922,7 @@ CONFIG_LOCKD=m CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT=y # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set -# CONFIG_LOCK_DOWN_KERNEL_FORCE is not set CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y -CONFIG_LOCK_DOWN_KERNEL=y CONFIG_LOCKD_V4=y CONFIG_LOCK_EVENT_COUNTS=y CONFIG_LOCK_STAT=y diff --git a/kernel-x86_64.config b/kernel-x86_64.config index 0d69909f1755..ccc8222e2898 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -2903,9 +2903,7 @@ CONFIG_LOCKD=m CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT=y # CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set # CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set -# CONFIG_LOCK_DOWN_KERNEL_FORCE is not set CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y -CONFIG_LOCK_DOWN_KERNEL=y CONFIG_LOCKD_V4=y # CONFIG_LOCK_EVENT_COUNTS is not set # CONFIG_LOCK_STAT is not set -- 2.21.0