On Mon, Oct 16, 2023 at 01:52:57PM +0100, Conor Dooley wrote: > > + select RISCV_DMA_NONCOHERENT > > select ERRATA_ANDES if RISCV_SBI > > select ERRATA_ANDES_CMO if ERRATA_ANDES > > Since this Kconfig menu has changed a bit in linux-next, the selects > are unconditional here, and ERRATA_ANDES_CMO will in turn select > RISCV_DMA_NONCOHERENT. Oh, looks like another patch landed there in linux-next. I had waited for the previous one go go upstream in -rc6. Not sure how to best handle this conflict.