From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Palmer Dabbelt <palmer@dabbelt•com>,
Paul Walmsley <paul@pwsan•com>,
Andrew Morton <akpm@linux-foundation•org>
Cc: Alexandre Ghiti <alexghiti@rivosinc•com>,
Andrew Bresticker <abrestic@rivosinc•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
"Matthew Wilcox (Oracle)" <willy@infradead•org>
Subject: linux-next: manual merge of the risc-v tree with the mm tree
Date: Fri, 4 Apr 2025 10:54:40 +1100 [thread overview]
Message-ID: <20250404105440.16e0f73b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1421 bytes --]
Hi all,
Today's linux-next merge of the risc-v tree got a conflict in:
arch/riscv/include/asm/pgtable.h
between commit:
012d57e6ee75 ("mm: introduce a common definition of mk_pte()")
from the mm tree and commit:
03dc00a2b678 ("riscv: Support huge pfnmaps")
from the risc-v 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/riscv/include/asm/pgtable.h
index 293a7776fe07,428e48e5f57d..000000000000
--- a/arch/riscv/include/asm/pgtable.h
+++ b/arch/riscv/include/asm/pgtable.h
@@@ -339,6 -343,16 +343,14 @@@ static inline pte_t pfn_pte(unsigned lo
return __pte((pfn << _PAGE_PFN_SHIFT) | prot_val);
}
-#define mk_pte(page, prot) pfn_pte(page_to_pfn(page), prot)
-
+ #define pte_pgprot pte_pgprot
+ static inline pgprot_t pte_pgprot(pte_t pte)
+ {
+ unsigned long pfn = pte_pfn(pte);
+
+ return __pgprot(pte_val(pfn_pte(pfn, __pgprot(0))) ^ pte_val(pte));
+ }
+
static inline int pte_present(pte_t pte)
{
return (pte_val(pte) & (_PAGE_PRESENT | _PAGE_PROT_NONE));
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-04-03 23:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-03 23:54 Stephen Rothwell [this message]
2025-04-06 23:35 ` linux-next: manual merge of the risc-v tree with the mm tree 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=20250404105440.16e0f73b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=abrestic@rivosinc$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=alexghiti@rivosinc$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=palmer@dabbelt$(echo .)com \
--cc=paul@pwsan$(echo .)com \
--cc=willy@infradead$(echo .)org \
/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