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-armv7hl-debug-fedora.config | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'kernel-armv7hl-debug-fedora.config') diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 8e619a466..a7368d073 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -1477,6 +1477,7 @@ CONFIG_DA311=m CONFIG_DA9052_WATCHDOG=m CONFIG_DA9055_WATCHDOG=m CONFIG_DA9063_WATCHDOG=m +# CONFIG_DAMON is not set CONFIG_DAVICOM_PHY=m CONFIG_DAX=y CONFIG_DCB=y @@ -2459,6 +2460,7 @@ CONFIG_GPIO_TS4800=m CONFIG_GPIO_TWL4030=m CONFIG_GPIO_TWL6040=m CONFIG_GPIO_VIPERBOARD=m +# CONFIG_GPIO_VIRTIO is not set CONFIG_GPIO_WATCHDOG=m # CONFIG_GPIO_WINBOND is not set CONFIG_GPIO_WM8994=m @@ -3116,8 +3118,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_DMA=y # CONFIG_IOMMU_IO_PGTABLE_ARMV7S is not set @@ -3983,6 +3985,8 @@ CONFIG_MFD_RK808=y # 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=m # CONFIG_MFD_RT5033 is not set CONFIG_MFD_SEC_CORE=y @@ -4971,6 +4975,7 @@ CONFIG_NTB_EPF=m CONFIG_NULL_TTY=m CONFIG_NVEC_PAZ00=y CONFIG_NVEC_POWER=y +# CONFIG_NVHE_EL2_DEBUG is not set CONFIG_NVME_FC=m CONFIG_NVME_HWMON=y CONFIG_NVMEM_IMX_IIM=m @@ -5187,6 +5192,7 @@ CONFIG_PCIE_MICROCHIP_HOST=y CONFIG_PCIEPORTBUS=y CONFIG_PCIE_PTM=y CONFIG_PCIE_QCOM=y +# CONFIG_PCIE_ROCKCHIP_DW_HOST is not set CONFIG_PCIE_ROCKCHIP_HOST=y CONFIG_PCIE_XILINX_CPM=y CONFIG_PCIE_XILINX=y @@ -7201,7 +7207,7 @@ CONFIG_SND_SOC_SOF_PCI=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set -CONFIG_SND_SOC_SSM2518=m +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set @@ -8831,7 +8837,7 @@ CONFIG_WATCH_QUEUE=y CONFIG_WCN36XX=m CONFIG_WDAT_WDT=m CONFIG_WDTPCI=m -CONFIG_WERROR=y +# CONFIG_WERROR is not set # CONFIG_WFX is not set CONFIG_WIL6210_DEBUGFS=y CONFIG_WIL6210_ISR_COR=y -- cgit