* linux-next: manual merge of the akpm tree with the arm64-fixes tree
@ 2021-05-26 6:49 Stephen Rothwell
2021-05-26 9:02 ` Catalin Marinas
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2021-05-26 6:49 UTC (permalink / raw)
To: Andrew Morton, Catalin Marinas, Will Deacon
Cc: Jisheng Zhang, Linux Kernel Mailing List,
Linux Next Mailing List, Mike Rapoport, Mike Rapoport,
Stephen Rothwell
[-- Attachment #1: Type: text/plain, Size: 1339 bytes --]
Hi all,
Today's linux-next merge of the akpm tree got a conflict in:
arch/arm64/mm/mmu.c
between commit:
e69012400b0c ("arm64: mm: don't use CON and BLK mapping if KFENCE is enabled")
from the arm64-fixes tree and patch:
"set_memory: allow querying whether set_direct_map_*() is actually enabled"
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/arm64/mm/mmu.c
index cbcbd64818eb,e3b639e2461d..000000000000
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@@ -515,8 -516,7 +516,7 @@@ static void __init map_mem(pgd_t *pgdp
*/
BUILD_BUG_ON(pgd_index(direct_map_end - 1) == pgd_index(direct_map_end));
- if (rodata_full || crash_mem_map || debug_pagealloc_enabled() ||
- IS_ENABLED(CONFIG_KFENCE))
- if (can_set_direct_map() || crash_mem_map)
++ if (can_set_direct_map() || crash_mem_map || IS_ENABLED(CONFIG_KFENCE))
flags |= NO_BLOCK_MAPPINGS | NO_CONT_MAPPINGS;
/*
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the akpm tree with the arm64-fixes tree
2021-05-26 6:49 linux-next: manual merge of the akpm tree with the arm64-fixes tree Stephen Rothwell
@ 2021-05-26 9:02 ` Catalin Marinas
0 siblings, 0 replies; 2+ messages in thread
From: Catalin Marinas @ 2021-05-26 9:02 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Andrew Morton, Will Deacon, Jisheng Zhang,
Linux Kernel Mailing List, Linux Next Mailing List,
Mike Rapoport, Mike Rapoport
On Wed, May 26, 2021 at 04:49:10PM +1000, Stephen Rothwell wrote:
> diff --cc arch/arm64/mm/mmu.c
> index cbcbd64818eb,e3b639e2461d..000000000000
> --- a/arch/arm64/mm/mmu.c
> +++ b/arch/arm64/mm/mmu.c
> @@@ -515,8 -516,7 +516,7 @@@ static void __init map_mem(pgd_t *pgdp
> */
> BUILD_BUG_ON(pgd_index(direct_map_end - 1) == pgd_index(direct_map_end));
>
> - if (rodata_full || crash_mem_map || debug_pagealloc_enabled() ||
> - IS_ENABLED(CONFIG_KFENCE))
> - if (can_set_direct_map() || crash_mem_map)
> ++ if (can_set_direct_map() || crash_mem_map || IS_ENABLED(CONFIG_KFENCE))
> flags |= NO_BLOCK_MAPPINGS | NO_CONT_MAPPINGS;
It looks fine. Thanks Stephen.
--
Catalin
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-05-26 9:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-26 6:49 linux-next: manual merge of the akpm tree with the arm64-fixes tree Stephen Rothwell
2021-05-26 9:02 ` Catalin Marinas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).