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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20250331102443.163c94b3@canb.auug.org.au>
Date: Mon, 31 Mar 2025 10:24:43 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Andrew Morton <akpm@...ux-foundation.org>
Cc: Heiko Carstens <hca@...ux.ibm.com>, Vasily Gorbik <gor@...ux.ibm.com>,
 Christian Borntraeger <borntraeger@...ibm.com>, Anshuman Khandual
 <anshuman.khandual@....com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Niklas Schnelle <schnelle@...ux.ibm.com>,
 Ryan Roberts <ryan.roberts@....com>
Subject: Re: linux-next: manual merge of the s390 tree with the mm tree

Hi all,

On Wed, 12 Mar 2025 12:07:34 +1100 Stephen Rothwell <sfr@...b.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

Content of type "application/pgp-signature" skipped