On Tue, Oct 17, 2023 at 12:44:41PM +0200, Geert Uytterhoeven wrote: > Hi Christoph, > > On Mon, Oct 16, 2023 at 3:17 PM Christoph Hellwig <hch@xxxxxx> wrote: > > 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. > > I think the easiest is to ask soc to apply this series? I don't think pulling all the DMA bits into a random other tree would be a good idea. I can hand off the first few bits, but I'd need a stable branch to pull in after that. Which of the half a dozen soc trees we have in linux-next is this anyway?
