diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-10-10 20:29:56 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-10-10 20:29:56 +0200 |
commit | 6019d1a387739021b15b2645c6200cf8d306c415 (patch) | |
tree | 934382b0eabde7965413d9a766c7034dd25ae357 /kernel-s390x.config | |
parent | 3634f5708478f3bf7744739c6eb6751c6e8f281f (diff) | |
parent | b4ce63cb54601c1e0652fd1135e5b5dd20809f79 (diff) | |
download | kernel-5.4.0-0.rc2.git2.1.vanilla.knurd.1.fc29.tar.gz kernel-5.4.0-0.rc2.git2.1.vanilla.knurd.1.fc29.tar.xz kernel-5.4.0-0.rc2.git2.1.vanilla.knurd.1.fc29.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.4.0-0.rc2.git2.1.vanilla.knurd.1.fc32kernel-5.4.0-0.rc2.git2.1.vanilla.knurd.1.fc31kernel-5.4.0-0.rc2.git2.1.vanilla.knurd.1.fc30kernel-5.4.0-0.rc2.git2.1.vanilla.knurd.1.fc29
Diffstat (limited to 'kernel-s390x.config')
-rw-r--r-- | kernel-s390x.config | 14 |
1 files changed, 0 insertions, 14 deletions
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 |