diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-14 19:04:42 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-01-14 19:04:42 +0100 |
commit | ac6f27305b591b38d13ddaab436c3fde4887ae2b (patch) | |
tree | 05c57fff195527b28631864cdf3ffdb634658f59 /kernel-s390x-rhel.config | |
parent | 91b4aab5ff1cd6e2602d5b520be3a73a0643cb2c (diff) | |
parent | e0a4f2fa8f2e52ac890f497a4e5ea596dbd97222 (diff) | |
download | kernel-ac6f27305b591b38d13ddaab436c3fde4887ae2b.tar.gz kernel-ac6f27305b591b38d13ddaab436c3fde4887ae2b.tar.xz kernel-ac6f27305b591b38d13ddaab436c3fde4887ae2b.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.11.0-0.rc3.20210114git65f0d2414b70.125.vanilla.1.fc33
Diffstat (limited to 'kernel-s390x-rhel.config')
-rw-r--r-- | kernel-s390x-rhel.config | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 35584ae70..660fa68c6 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -20,24 +20,32 @@ CONFIG_ACPI_AC=y CONFIG_ACPI_APEI_EINJ=m # CONFIG_ACPI_APEI_ERST_DEBUG is not set CONFIG_ACPI_APEI_GHES=y +CONFIG_ACPI_APEI_MEMORY_FAILURE=y CONFIG_ACPI_APEI_PCIEAER=y CONFIG_ACPI_APEI=y CONFIG_ACPI_BATTERY=y +CONFIG_ACPI_BGRT=y +CONFIG_ACPI_BUTTON=y +# CONFIG_ACPI_CMPC is not set # CONFIG_ACPI_CONFIGFS is not set +CONFIG_ACPI_CONTAINER=y # CONFIG_ACPI_CUSTOM_METHOD is not set # CONFIG_ACPI_DEBUGGER is not set # CONFIG_ACPI_DEBUGGER_USER is not set # CONFIG_ACPI_DEBUG is not set -# CONFIG_ACPI_DPTF is not set +# CONFIG_ACPI_EC_DEBUGFS is not set +CONFIG_ACPI_FAN=y CONFIG_ACPI_HED=y CONFIG_ACPI_HMAT=y CONFIG_ACPI_I2C_OPREGION=y CONFIG_ACPI_IPMI=m CONFIG_ACPI_NFIT=m +CONFIG_ACPI_NUMA=y CONFIG_ACPI_PCI_SLOT=y CONFIG_ACPI_PROCESSOR=y +CONFIG_ACPI_SPCR_TABLE=y CONFIG_ACPI_TABLE_UPGRADE=y -# CONFIG_ACPI_TOSHIBA is not set +CONFIG_ACPI_THERMAL=y # CONFIG_ACQUIRE_WDT is not set # CONFIG_AD2S1200 is not set # CONFIG_AD2S1210 is not set @@ -1071,7 +1079,10 @@ CONFIG_DM_DELAY=m # CONFIG_DM_EBS is not set CONFIG_DM_ERA=m CONFIG_DM_FLAKEY=m +CONFIG_DMIID=y CONFIG_DM_INTEGRITY=m +CONFIG_DMI_SYSFS=y +CONFIG_DMI=y CONFIG_DM_LOG_USERSPACE=m CONFIG_DM_LOG_WRITES=m CONFIG_DM_MIRROR=m @@ -1102,7 +1113,6 @@ CONFIG_DP83867_PHY=m # CONFIG_DP83869_PHY is not set CONFIG_DP83TC811_PHY=m # CONFIG_DPS310 is not set -# CONFIG_DPTF_PCH_FIVR is not set # CONFIG_DRAGONRISE_FF is not set CONFIG_DRM_AMD_ACP=y # CONFIG_DRM_AMD_DC_DCN1_0 is not set @@ -4498,6 +4508,7 @@ CONFIG_SECURITY_YAMA=y # CONFIG_SENSIRION_SGP30 is not set CONFIG_SENSORS_ABITUGURU3=m CONFIG_SENSORS_ABITUGURU=m +CONFIG_SENSORS_ACPI_POWER=m # CONFIG_SENSORS_AD7314 is not set CONFIG_SENSORS_AD7414=m CONFIG_SENSORS_AD7418=m @@ -5116,7 +5127,6 @@ CONFIG_SND_SOC_WM8804_I2C=m # CONFIG_SND_SOC_ZL38060 is not set # CONFIG_SND_SOC_ZX_AUD96P22 is not set # CONFIG_SND_SONICVIBES is not set -CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m # CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI is not set # CONFIG_SND_SUPPORT_OLD_API is not set @@ -6172,7 +6182,7 @@ CONFIG_X86_AMD_PLATFORM_DEVICE=y CONFIG_X86_IOPL_IOPERM=y CONFIG_X86_PMEM_LEGACY_DEVICE=y CONFIG_X86_PMEM_LEGACY=m -# CONFIG_X86_SGX is not set +CONFIG_X86_SGX=y CONFIG_XDP_SOCKETS_DIAG=m CONFIG_XDP_SOCKETS=y # CONFIG_XEN_BACKEND is not set |