From: "David Hildenbrand (Arm)" <david@kernel.org>
To: Andrew Morton <akpm@linux-foundation.org>,
Mike Rapoport <rppt@kernel.org>
Cc: mm-commits@vger.kernel.org, Muchun Song <muchun.song@linux.dev>,
Kaitao Cheng <chengkaitao@kylinos.cn>
Subject: mm-next: manual merge of the akpm/mm-unstable branch
Date: Wed, 14 Oct 2026 11:16:52 +0200 [thread overview]
Message-ID: <836fd90a-4417-4457-97bd-e540f41de597@kernel.org> (raw)
Hi,
today's mm-next merge of the akpm/mm-unstable branch tree got a conflict in:
mm/sparse-vmemmap.c
between the commit:
063b5e8bbd21 mm: Remove unused exact_nid parameter from memmap_alloc()
from the memblock/for-next branch:
59cbd435300c mm/sparse-vmemmap: factor out shared vmemmap tail page allocation
from the akpm/mm-unstable branch.
I resolved the conflict manually and will carry the conflict resolution going
forward. "git show --remerge-diff" output for brevity; if people prefer a
different (longer?) output please shout.
diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c
remerge CONFLICT (content): Merge conflict in mm/sparse-vmemmap.c
index a43f1256bf5e..5d7e982f94d0 100644
--- a/mm/sparse-vmemmap.c
+++ b/mm/sparse-vmemmap.c
@@ -36,11 +36,7 @@
#include "mm_init.h"
#include "sparse.h"
-<<<<<<< 46c6d937b2c5 (Merge https://git.kernel.org/pub/scm/linux/kernel/git/mm/memblock.git for-next into for-next)
-void * __meminit vmemmap_alloc_block(unsigned long size, int node)
-=======
void __ref *vmemmap_alloc_block(unsigned long size, int node)
->>>>>>> 1d0b04a60516 (mm: page_alloc: make defrag_mode retries follow the promoted order)
{
/* If the main allocator is up use that, fallback to bootmem. */
if (slab_is_available()) {
@@ -60,11 +56,7 @@ void __ref *vmemmap_alloc_block(unsigned long size, int node)
}
return NULL;
} else
-<<<<<<< 46c6d937b2c5 (Merge https://git.kernel.org/pub/scm/linux/kernel/git/mm/memblock.git for-next into for-next)
return memmap_alloc(size, size, __pa(MAX_DMA_ADDRESS), node);
-=======
- return memmap_alloc(size, size, __pa(MAX_DMA_ADDRESS), node, false);
->>>>>>> 1d0b04a60516 (mm: page_alloc: make defrag_mode retries follow the promoted order)
}
static void * __meminit altmap_alloc_block_buf(unsigned long size,
next reply other threads:[~2026-10-14 9:16 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-14 9:16 David Hildenbrand (Arm) [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-11-20 11:42 mm-next: manual merge of the akpm/mm-unstable branch David Hildenbrand (Arm)
2026-10-02 6:22 David Hildenbrand (Arm)
2026-10-02 8:15 ` Lorenzo Stoakes (ARM)
2026-10-02 12:16 ` David Hildenbrand (Arm)
2026-10-02 12:24 ` Lorenzo Stoakes (ARM)
2026-10-02 23:22 ` Andrew Morton
2026-09-22 19:17 David Hildenbrand (Arm)
2026-09-22 19:48 ` Andrew Morton
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=836fd90a-4417-4457-97bd-e540f41de597@kernel.org \
--to=david@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=chengkaitao@kylinos.cn \
--cc=mm-commits@vger.kernel.org \
--cc=muchun.song@linux.dev \
--cc=rppt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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