From 58bd8a39c318c64feba7edfcd6f29d801c5779d8 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Thu, 10 Oct 2019 11:41:47 -0400 Subject: Kconfig symbol cleanup for v5.4-rc1 Two Kconfig symbols were part of upstream v5.3-rc1 but didn't make it into v5.3 (for reasons I couldn't be bothered to unearth): PREEMPT_LL and SOUNDWIRE_BUS. Remove them from our configuration generation system too. Commit 3e636fe3a695 ("Remove patch for GCC VTA") forgot to clean up the configs/ directory. Do so now. 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. Commit 5c0d4daff4a0 ("Remove crash driver") forgot to clean up the configs/ directory. Do so now. There are 22 Kconfig symbols referenced in the files used for configuration generation and in the shipped .config files that were dropped in upstream v5.4-rc1. The references to these symbols can be safely removed. These symbols are: CONFIG_ARM_QCOM_CPUFREQ_KRYO CONFIG_CRYPTO_AEGIS128L CONFIG_CRYPTO_AEGIS128L_AESNI_SSE2 CONFIG_CRYPTO_AEGIS256 CONFIG_CRYPTO_AEGIS256_AESNI_SSE2 CONFIG_CRYPTO_AES_586 CONFIG_CRYPTO_AES_X86_64 CONFIG_CRYPTO_MORUS1280 CONFIG_CRYPTO_MORUS1280_AVX2 CONFIG_CRYPTO_MORUS1280_SSE2 CONFIG_CRYPTO_MORUS640 CONFIG_CRYPTO_MORUS640_SSE2 CONFIG_DRM_TINYDRM CONFIG_HISI_KIRIN_DW_DSI CONFIG_I2C_BCM2048 CONFIG_KEXEC_VERIFY_SIG CONFIG_MFD_CROS_EC_CHARDEV CONFIG_MTD_M25P80 CONFIG_SENSORS_ADS1015 CONFIG_SERIAL_8250_MOXA CONFIG_SGI_IOC4 CONFIG_TINYDRM_MIPI_DBI Signed-off-by: Paul Bolle --- kernel-s390x.config | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'kernel-s390x.config') diff --git a/kernel-s390x.config b/kernel-s390x.config index 3ff05de88..263ad26a4 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -808,7 +808,6 @@ CONFIG_CPUSETS=y CONFIG_CRAMFS=m # CONFIG_CRAMFS_MTD is not set CONFIG_CRASH_DUMP=y -CONFIG_CRASH=m CONFIG_CRC16=y # CONFIG_CRC32_BIT is not set # CONFIG_CRC32_SARWATE is not set @@ -833,9 +832,7 @@ CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_CROS_USBPD_LOGGER=m CONFIG_CRYPTO_842=y CONFIG_CRYPTO_ADIANTUM=m -CONFIG_CRYPTO_AEGIS128L=m CONFIG_CRYPTO_AEGIS128=m -CONFIG_CRYPTO_AEGIS256=m CONFIG_CRYPTO_AES_S390=m CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES=y @@ -906,8 +903,6 @@ CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MD5=y CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_MORUS1280=m -CONFIG_CRYPTO_MORUS640=m CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_OFB=m CONFIG_CRYPTO_PAES_S390=m @@ -993,7 +988,6 @@ CONFIG_DEBUG_HIGHMEM=y # CONFIG_DEBUG_INFO_DWARF4 is not set # CONFIG_DEBUG_INFO_REDUCED is not set # CONFIG_DEBUG_INFO_SPLIT is not set -CONFIG_DEBUG_INFO_VTA=y CONFIG_DEBUG_INFO=y # CONFIG_DEBUG_KERNEL_DC is not set CONFIG_DEBUG_KERNEL=y @@ -1215,7 +1209,6 @@ CONFIG_DRM_SII9234=m # CONFIG_DRM_SIL_SII8620 is not set # CONFIG_DRM_TDFX=n is not set # CONFIG_DRM_THINE_THC63LVD1024 is not set -# CONFIG_DRM_TINYDRM is not set CONFIG_DRM_TI_SN65DSI86=m CONFIG_DRM_TI_TFP410=m CONFIG_DRM_TOSHIBA_TC358764=m @@ -1829,7 +1822,6 @@ CONFIG_I2C_ALGOBIT=m # CONFIG_I2C_AMD8111 is not set CONFIG_I2C_AMD_MP2=m # CONFIG_I2C_ARB_GPIO_CHALLENGE is not set -# CONFIG_I2C_BCM2048 is not set # CONFIG_I2C_CADENCE is not set # CONFIG_I2C_CBUS_GPIO is not set # CONFIG_I2C_CHARDEV is not set @@ -2392,7 +2384,6 @@ CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_XZ is not set CONFIG_KEXEC_FILE=y CONFIG_KEXEC_SIG=y -# CONFIG_KEXEC_VERIFY_SIG is not set CONFIG_KEXEC=y # CONFIG_KEYBOARD_ADC is not set # CONFIG_KEYBOARD_ADP5588 is not set @@ -2579,7 +2570,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 @@ -3912,7 +3902,6 @@ CONFIG_PPTP=m # CONFIG_PREEMPTIRQ_DELAY_TEST is not set # CONFIG_PREEMPTIRQ_EVENTS is not set # CONFIG_PREEMPT is not set -# CONFIG_PREEMPT_LL is not set # CONFIG_PREEMPT_NONE is not set CONFIG_PREEMPT_VOLUNTARY=y CONFIG_PREVENT_FIRMWARE_BUILD=y @@ -4504,7 +4493,6 @@ CONFIG_SENSORS_ADM1029=m CONFIG_SENSORS_ADM1031=m CONFIG_SENSORS_ADM1275=m CONFIG_SENSORS_ADM9240=m -# CONFIG_SENSORS_ADS1015 is not set CONFIG_SENSORS_ADS7828=m CONFIG_SENSORS_ADS7871=m CONFIG_SENSORS_ADT7310=m @@ -4727,7 +4715,6 @@ CONFIG_SFC_FALCON=m CONFIG_SFC_FALCON_MTD=y # CONFIG_SFC is not set CONFIG_SFP=m -# CONFIG_SGI_IOC4 is not set # CONFIG_SGI_PARTITION is not set CONFIG_SHUFFLE_PAGE_ALLOCATOR=y # CONFIG_SI1133 is not set @@ -5107,7 +5094,6 @@ CONFIG_SONY_FF=y # CONFIG_SONYPI is not set # CONFIG_SOUND is not set CONFIG_SOUND_OSS_CORE_PRECLAIM=y -CONFIG_SOUNDWIRE_BUS=m CONFIG_SOUNDWIRE_CADENCE=m CONFIG_SOUNDWIRE=y CONFIG_SPARSEMEM_MANUAL=y -- cgit