Re: linux-next: manual merge of the s390 tree with the mm tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1701 bytes --]

Hi all,

On Wed, 12 Mar 2025 12:07:34 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the s390 tree got a conflict in:
> 
>   arch/s390/include/asm/io.h
> 
> between commit:
> 
>   08a7874a8e6f ("mm/ioremap: pass pgprot_t to ioremap_prot() instead of unsigned long")
> 
> from the mm-unstable branch of the mm tree and commit:
> 
>   c94bff63e493 ("s390: Remove ioremap_wt() and pgprot_writethrough()")
> 
> from the s390 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.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc arch/s390/include/asm/io.h
> index 82f1043a4fc3,251e0372ccbd..000000000000
> --- a/arch/s390/include/asm/io.h
> +++ b/arch/s390/include/asm/io.h
> @@@ -33,9 -33,7 +33,7 @@@ void unxlate_dev_mem_ptr(phys_addr_t ph
>   #define _PAGE_IOREMAP pgprot_val(PAGE_KERNEL)
>   
>   #define ioremap_wc(addr, size)  \
>  -	ioremap_prot((addr), (size), pgprot_val(pgprot_writecombine(PAGE_KERNEL)))
>  +	ioremap_prot((addr), (size), pgprot_writecombine(PAGE_KERNEL))
> - #define ioremap_wt(addr, size)  \
> - 	ioremap_prot((addr), (size), pgprot_writethrough(PAGE_KERNEL))
>   
>   static inline void __iomem *ioport_map(unsigned long port, unsigned int nr)
>   {

This is now a conflict between the mm-stable tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]