From 4b8e4cc5753be5501810f3e2e8724cf462e9d4ac Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 9 Sep 2021 09:52:04 -0500 Subject: kernel-5.15-0.rc0.20210909gita3fa7a101dcf.8 * Thu Sep 09 2021 Justin M. Forbes [5.15-0.rc0.20210909gita3fa7a101dcf.8] - Fixup IOMMU configs in pending so that configs are sane again (Justin M. Forbes) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- kernel-s390x-debug-rhel.config | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'kernel-s390x-debug-rhel.config') diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index be0721192..d0b283933 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -963,6 +963,7 @@ CONFIG_CXL_PMEM=m # CONFIG_CYZ_INTR is not set # CONFIG_DA280 is not set # CONFIG_DA311 is not set +# CONFIG_DAMON is not set CONFIG_DASD_DIAG=m CONFIG_DASD_ECKD=m CONFIG_DASD_EER=y @@ -1733,6 +1734,7 @@ CONFIG_GPIO_SYSFS=y # CONFIG_GPIO_THUNDERX is not set # CONFIG_GPIO_TPIC2810 is not set CONFIG_GPIO_VIPERBOARD=m +# CONFIG_GPIO_VIRTIO is not set # CONFIG_GPIO_VX855 is not set # CONFIG_GPIO_WATCHDOG is not set # CONFIG_GPIO_WINBOND is not set @@ -2271,8 +2273,8 @@ CONFIG_IO_DELAY_0X80=y # CONFIG_IO_DELAY_NONE is not set # CONFIG_IO_DELAY_UDELAY is not set CONFIG_IOMMU_DEBUGFS=y -# CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set -CONFIG_IOMMU_DEFAULT_DMA_STRICT=y +CONFIG_IOMMU_DEFAULT_DMA_LAZY=y +# CONFIG_IOMMU_DEFAULT_DMA_STRICT is not set # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set @@ -2986,6 +2988,8 @@ CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 # CONFIG_MFD_ROHM_BD71828 is not set # CONFIG_MFD_ROHM_BD718XX is not set # CONFIG_MFD_ROHM_BD957XMUF is not set +# CONFIG_MFD_RSMU_I2C is not set +# CONFIG_MFD_RSMU_SPI is not set # CONFIG_MFD_RT4831 is not set # CONFIG_MFD_RT5033 is not set # CONFIG_MFD_SEC_CORE is not set @@ -3786,6 +3790,7 @@ CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y CONFIG_NUMA=y CONFIG_NVDIMM_DAX=y CONFIG_NVDIMM_PFN=y +# CONFIG_NVHE_EL2_DEBUG is not set CONFIG_NVME_FC=m # CONFIG_NVME_HWMON is not set # CONFIG_NVMEM_NINTENDO_OTP is not set @@ -6611,7 +6616,7 @@ CONFIG_WATCH_QUEUE=y # CONFIG_WCN36XX is not set # CONFIG_WDAT_WDT is not set # CONFIG_WDTPCI is not set -CONFIG_WERROR=y +# CONFIG_WERROR is not set # CONFIG_WIL6210 is not set # CONFIG_WILC1000_SDIO is not set # CONFIG_WILC1000_SPI is not set -- cgit