From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Heiko Carstens <hca@linux•ibm.com>,
Vasily Gorbik <gor@linux•ibm.com>,
Christian Borntraeger <borntraeger@de•ibm.com>,
Andrew Morton <akpm@linux-foundation•org>
Cc: Anshuman Khandual <anshuman.khandual@arm•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Niklas Schnelle <schnelle@linux•ibm.com>,
Ryan Roberts <ryan.roberts@arm•com>
Subject: linux-next: manual merge of the s390 tree with the mm tree
Date: Wed, 12 Mar 2025 12:07:34 +1100 [thread overview]
Message-ID: <20250312120734.4a1e4f4f@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1431 bytes --]
Hi all,
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)
{
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-03-12 1:07 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-12 1:07 Stephen Rothwell [this message]
2025-03-30 23:24 ` linux-next: manual merge of the s390 tree with the mm tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2024-10-28 0:16 Stephen Rothwell
2024-11-20 1:19 ` Stephen Rothwell
2023-07-30 23:37 Stephen Rothwell
2023-07-24 23:40 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250312120734.4a1e4f4f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=anshuman.khandual@arm$(echo .)com \
--cc=borntraeger@de$(echo .)ibm.com \
--cc=gor@linux$(echo .)ibm.com \
--cc=hca@linux$(echo .)ibm.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=ryan.roberts@arm$(echo .)com \
--cc=schnelle@linux$(echo .)ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox