[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <20250326120530.34cc9b24@canb.auug.org.au>
Date: Wed, 26 Mar 2025 12:05:30 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...hat.com>,
"H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org>,
Anshuman Khandual <anshuman.khandual@....com>, Ingo Molnar
<mingo@...nel.org>, "Kirill A. Shutemov" <kirill.shutemov@...ux.intel.com>,
Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
Mailing List <linux-next@...r.kernel.org>, Ryan Roberts
<ryan.roberts@....com>
Subject: Re: linux-next: manual merge of the tip tree with the mm tree
Hi all,
On Mon, 24 Feb 2025 14:42:40 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> arch/riscv/include/asm/io.h
>
> between commit:
>
> 85731f537aaf ("mm/ioremap: pass pgprot_t to ioremap_prot() instead of unsigned long")
>
> from th mm-unstable breanch of the mm tree and commit:
>
> a9ebcb88136c ("mm/memremap: Pass down MEMREMAP_* flags to arch_memremap_wb()")
>
> from the tip tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> 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 */
This is now a conflict between the mm-stable tree and Linus' tree.
--
Cheers,
Stephen Rothwell
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists