The fix for the merge-conflict looks good. On 2/24/25 09:12, Stephen Rothwell wrote: > diff --cc arch/riscv/include/asm/io.h > index 0536846db9b6,0257f4aa7ff4..000000000000 > --- a/arch/riscv/include/asm/io.h > +++ b/arch/riscv/include/asm/io.h > @@@ -136,8 -136,8 +136,8 @@@ __io_writes_outs(outs, u64, q, __io_pbr > #include <asm-generic/io.h> > > #ifdef CONFIG_MMU > - #define arch_memremap_wb(addr, size) \ > + #define arch_memremap_wb(addr, size, flags) \ > - ((__force void *)ioremap_prot((addr), (size), _PAGE_KERNEL)) > + ((__force void *)ioremap_prot((addr), (size), __pgprot(_PAGE_KERNEL))) > #endif > > #endif /* _ASM_RISCV_IO_H */
