From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>, Arnd Bergmann <arnd@arndb•de>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Baoquan He <bhe@redhat•com>
Subject: linux-next: manual merge of the akpm-current tree with the asm-generic tree
Date: Thu, 15 Mar 2018 20:00:15 +1100 [thread overview]
Message-ID: <20180315200015.63d54b51@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1490 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in:
mm/sparse.c
between commit:
123d3239fb65 ("mm: remove obsolete alloc_remap()")
from the asm-generic tree and commit:
9c6a14b65e50 ("mm/sparse.c: optimize memmap allocation during sparse_init()")
from the akpm-current 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 mm/sparse.c
index 65bb52599f90,873617fab5ff..000000000000
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@@ -441,7 -454,21 +450,8 @@@ void __init sparse_mem_maps_populate_no
void *map;
unsigned long pnum;
unsigned long size = sizeof(struct page) * PAGES_PER_SECTION;
+ int idx_present;
- map = alloc_remap(nodeid, size * map_count);
- if (map) {
- idx_present = 0;
- for (pnum = pnum_begin; pnum < pnum_end; pnum++) {
- if (!present_section_nr(pnum))
- continue;
- map_map[idx_present] = map;
- map += size;
- idx_present++;
- }
- return;
- }
-
size = PAGE_ALIGN(size);
map = memblock_virt_alloc_try_nid_raw(size * map_count,
PAGE_SIZE, __pa(MAX_DMA_ADDRESS),
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-03-15 9:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-15 9:00 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-03-15 9:05 linux-next: manual merge of the akpm-current tree with the asm-generic tree Stephen Rothwell
2018-03-15 9:10 Stephen Rothwell
2018-03-15 9:13 Stephen Rothwell
2018-12-20 7:44 Stephen Rothwell
2022-03-03 8:17 Stephen Rothwell
2022-03-23 22:16 ` 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=20180315200015.63d54b51@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=arnd@arndb$(echo .)de \
--cc=bhe@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.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