From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Palmer Dabbelt <palmer@dabbelt•com>,
Paul Walmsley <paul@pwsan•com>
Cc: Geert Uytterhoeven <geert+renesas@glider•be>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Mike Rapoport <rppt@kernel•org>,
Mike Rapoport <rppt@linux•ibm.com>,
Palmer Dabbelt <palmerdabbelt@google•com>
Subject: linux-next: manual merge of the akpm tree with the risc-v tree
Date: Fri, 7 May 2021 11:24:26 +1000 [thread overview]
Message-ID: <20210507112426.7ed1f439@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1688 bytes --]
Hi all,
Today's linux-next merge of the akpm tree got a conflict in:
arch/riscv/include/asm/set_memory.h
between commit:
8d91b0973358 ("riscv: Consistify protect_kernel_linear_mapping_text_rodata() use")
from the risc-v tree and commit:
e022d55b4d97 ("set_memory: allow set_direct_map_*_noflush() for multiple pages")
from the akpm 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/set_memory.h
index 086f757e8ba3,b766f2ccd9de..000000000000
--- a/arch/riscv/include/asm/set_memory.h
+++ b/arch/riscv/include/asm/set_memory.h
@@@ -26,14 -27,8 +26,14 @@@ static inline void protect_kernel_text_
static inline int set_memory_rw_nx(unsigned long addr, int numpages) { return 0; }
#endif
+#if defined(CONFIG_64BIT) && defined(CONFIG_STRICT_KERNEL_RWX)
+void protect_kernel_linear_mapping_text_rodata(void);
+#else
+static inline void protect_kernel_linear_mapping_text_rodata(void) {}
+#endif
+
- int set_direct_map_invalid_noflush(struct page *page);
- int set_direct_map_default_noflush(struct page *page);
+ int set_direct_map_invalid_noflush(struct page *page, int numpages);
+ int set_direct_map_default_noflush(struct page *page, int numpages);
bool kernel_page_present(struct page *page);
#endif /* __ASSEMBLY__ */
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-05-07 1:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-07 1:24 Stephen Rothwell [this message]
2021-05-07 10:55 ` linux-next: manual merge of the akpm tree with the risc-v tree Mike Rapoport
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=20210507112426.7ed1f439@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=geert+renesas@glider$(echo .)be \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=palmer@dabbelt$(echo .)com \
--cc=palmerdabbelt@google$(echo .)com \
--cc=paul@pwsan$(echo .)com \
--cc=rppt@kernel$(echo .)org \
--cc=rppt@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