From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Christoph Hellwig <hch@lst•de>,
Palmer Dabbelt <palmer@dabbelt•com>,
Paul Walmsley <paul@pwsan•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: linux-next: manual merge of the generic-ioremap tree with the risc-v tree
Date: Mon, 18 Nov 2019 17:45:01 +1100 [thread overview]
Message-ID: <20191118174501.73050c78@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2025 bytes --]
Hi all,
Today's linux-next merge of the generic-ioremap tree got a conflict in:
arch/riscv/include/asm/io.h
between commit:
0c3ac28931d5 ("riscv: separate MMIO functions into their own header file")
from the risc-v tree and commits:
d092a8707326 ("arch: rely on asm-generic/io.h for default ioremap_* definitions")
38af57825313 ("riscv: use the generic ioremap code")
from the generic-ioremap 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.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Mon, 18 Nov 2019 17:42:04 +1100
Subject: [PATCH] fixup for moved code in riscv
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
arch/riscv/include/asm/mmio.h | 15 +--------------
1 file changed, 1 insertion(+), 14 deletions(-)
diff --git a/arch/riscv/include/asm/mmio.h b/arch/riscv/include/asm/mmio.h
index a297a835e402..a2c809df2733 100644
--- a/arch/riscv/include/asm/mmio.h
+++ b/arch/riscv/include/asm/mmio.h
@@ -14,20 +14,7 @@
#include <linux/types.h>
#include <asm/mmiowb.h>
-#ifdef CONFIG_MMU
-void __iomem *ioremap(phys_addr_t offset, unsigned long size);
-
-/*
- * The RISC-V ISA doesn't yet specify how to query or modify PMAs, so we can't
- * change the properties of memory regions. This should be fixed by the
- * upcoming platform spec.
- */
-#define ioremap_nocache(addr, size) ioremap((addr), (size))
-#define ioremap_wc(addr, size) ioremap((addr), (size))
-#define ioremap_wt(addr, size) ioremap((addr), (size))
-
-void iounmap(volatile void __iomem *addr);
-#else
+#ifndef CONFIG_MMU
#define pgprot_noncached(x) (x)
#endif /* CONFIG_MMU */
--
2.23.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-11-18 6:45 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-18 6:45 Stephen Rothwell [this message]
2019-11-18 6:51 ` linux-next: manual merge of the generic-ioremap tree with the risc-v tree Christoph Hellwig
2019-11-19 18:33 ` Paul Walmsley
-- strict thread matches above, loose matches on Subject: below --
2019-11-18 6:30 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=20191118174501.73050c78@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=palmer@dabbelt$(echo .)com \
--cc=paul@pwsan$(echo .)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