On 10/01/2025 at 14:52:29 GMT, Mark Brown <broonie@xxxxxxxxxx> wrote: > On Fri, Jan 10, 2025 at 03:37:52PM +0100, Miquel Raynal wrote: >> On 10/01/2025 at 12:42:47 GMT, Mark Brown <broonie@xxxxxxxxxx> wrote: > >> > This breaks the build: > >> > /build/stage/linux/drivers/spi/spi-mem.c:580:5: error: conflicting types for ‘spi_mem_calc_op_duration’; have ‘u64(struct spi_mem_op *)’ {aka ‘long long unsigned int(struct spi_mem_op *)’} >> > 580 | u64 spi_mem_calc_op_duration(struct spi_mem_op *op) > >> Crap, that's a fixup that landed in the wrong commit (mtd: spinand: >> Enhance the logic when picking a variant). I'll fix it. > > Please only resend that patch - the rest builds and tests fine in my CI, > I'm just checking a merge fixup. Ah, oops, didn't see this in time and rushed v3.