diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-05-07 21:00:17 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2019-05-07 21:01:32 +0200 |
commit | 53ebc2e1e870d3a1a57b425f554162531ba66635 (patch) | |
tree | 48a9d8e3f7dc60cb0af6dfa8560f32dd31460725 /kernel-s390x.config | |
parent | e4de46e4a321055136460422974dda8ac9aa31fc (diff) | |
parent | 2b2a5f0a2eea3e62eb9b8f4cbd428db15607bd18 (diff) | |
download | kernel-53ebc2e1e870d3a1a57b425f554162531ba66635.tar.gz kernel-53ebc2e1e870d3a1a57b425f554162531ba66635.tar.xz kernel-53ebc2e1e870d3a1a57b425f554162531ba66635.zip |
merge originkernel-5.2.0-0.rc0.git1.1.vanilla.knurd.1.fc31kernel-5.2.0-0.rc0.git1.1.vanilla.knurd.1.fc30kernel-5.2.0-0.rc0.git1.1.vanilla.knurd.1.fc29kernel-5.2.0-0.rc0.git1.1.vanilla.knurd.1.fc28
Diffstat (limited to 'kernel-s390x.config')
-rw-r--r-- | kernel-s390x.config | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/kernel-s390x.config b/kernel-s390x.config index 227961934..4ff841848 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -860,6 +860,7 @@ CONFIG_CRYPTO_DRBG_MENU=y CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECHAINIV=m +CONFIG_CRYPTO_ECRDSA=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_FIPS=y CONFIG_CRYPTO_GCM=y @@ -2064,7 +2065,7 @@ CONFIG_IO_DELAY_0X80=y # CONFIG_IOMMU_DEBUGFS is not set # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set CONFIG_IOMMU_SUPPORT=y -CONFIG_IOSCHED_BFQ=m +CONFIG_IOSCHED_BFQ=y CONFIG_IO_STRICT_DEVMEM=y CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_IPTABLES=m @@ -2366,6 +2367,7 @@ CONFIG_KERNEL_GZIP=y # CONFIG_KERNEL_UNCOMPRESSED is not set # CONFIG_KERNEL_XZ is not set CONFIG_KEXEC_FILE=y +# CONFIG_KEXEC_VERIFY_SIG is not set CONFIG_KEXEC=y # CONFIG_KEYBOARD_ADC is not set # CONFIG_KEYBOARD_ADP5588 is not set @@ -2542,6 +2544,7 @@ CONFIG_LOCKD=m # CONFIG_LOCK_DOWN_IN_EFI_SECURE_BOOT is not set # CONFIG_LOCK_DOWN_KERNEL is not set CONFIG_LOCKD_V4=y +# CONFIG_LOCK_EVENT_COUNTS is not set # CONFIG_LOCK_STAT is not set # CONFIG_LOCK_TORTURE_TEST is not set CONFIG_LOCKUP_DETECTOR=y @@ -2948,7 +2951,7 @@ CONFIG_MPLS_IPTUNNEL=m CONFIG_MPLS_ROUTING=m CONFIG_MPU3050_I2C=m CONFIG_MQ_IOSCHED_DEADLINE=y -CONFIG_MQ_IOSCHED_KYBER=m +CONFIG_MQ_IOSCHED_KYBER=y # CONFIG_MS5611 is not set # CONFIG_MS5637 is not set # CONFIG_MS_BLOCK is not set @@ -3832,6 +3835,7 @@ CONFIG_PROC_VMCORE_DEVICE_DUMP=y CONFIG_PROC_VMCORE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set CONFIG_PROFILING=y +# CONFIG_PROTECTED_VIRTUALIZATION_GUEST is not set # CONFIG_PROVE_LOCKING is not set CONFIG_PSAMPLE=m # CONFIG_PSI_DEFAULT_DISABLED is not set @@ -3912,6 +3916,7 @@ CONFIG_RADIO_WL1273=m # CONFIG_RAID6_PQ_BENCHMARK is not set CONFIG_RAID_ATTRS=m # CONFIG_RANDOM32_SELFTEST is not set +CONFIG_RANDOMIZE_BASE=y CONFIG_RANDOM_TRUST_CPU=y CONFIG_RAPIDIO_CHMAN=m CONFIG_RAPIDIO_CPS_GEN2=m @@ -4009,6 +4014,7 @@ CONFIG_REISERFS_FS_XATTR=y CONFIG_REISERFS_PROC_INFO=y CONFIG_RELAY=y # CONFIG_RELOCATABLE_TEST is not set +CONFIG_RELOCATABLE=y CONFIG_REMOTEPROC=m # CONFIG_RENESAS_PHY is not set # CONFIG_RESET_ATTACK_MITIGATION is not set @@ -4430,8 +4436,10 @@ CONFIG_SENSORS_INA209=m CONFIG_SENSORS_INA2XX=m CONFIG_SENSORS_INA3221=m # CONFIG_SENSORS_IR35221 is not set +# CONFIG_SENSORS_IR38064 is not set # CONFIG_SENSORS_ISL29018 is not set # CONFIG_SENSORS_ISL29028 is not set +# CONFIG_SENSORS_ISL68137 is not set CONFIG_SENSORS_IT87=m CONFIG_SENSORS_JC42=m CONFIG_SENSORS_LINEAGE=m @@ -4904,7 +4912,6 @@ CONFIG_SND_SOC_TLV320AIC32X4_SPI=m # CONFIG_SND_SOC_TS3A227E is not set CONFIG_SND_SOC_TSCS42XX=m # CONFIG_SND_SOC_TSCS454 is not set -# CONFIG_SND_SOC_WCD9335 is not set # CONFIG_SND_SOC_WM8510 is not set # CONFIG_SND_SOC_WM8523 is not set CONFIG_SND_SOC_WM8524=m @@ -5170,6 +5177,7 @@ CONFIG_TEST_KSTRTOX=y # CONFIG_TEST_STACKINIT is not set # CONFIG_TEST_STATIC_KEYS is not set # CONFIG_TEST_STRING_HELPERS is not set +# CONFIG_TEST_STRSCPY is not set # CONFIG_TEST_SYSCTL is not set # CONFIG_TEST_UDELAY is not set # CONFIG_TEST_USER_COPY is not set |