From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
Jason Gunthorpe <jgg@mellanox•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Christoph Hellwig <hch@lst•de>,
Dan Williams <dan.j.williams@intel•com>
Subject: linux-next: manual merge of the akpm-current tree with the hmm tree
Date: Thu, 4 Jul 2019 20:55:36 +1000 [thread overview]
Message-ID: <20190704205536.32740b34@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1707 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
mm/memory_hotplug.c
between commit:
514caf23a70f ("memremap: replace the altmap_valid field with a PGMAP_ALTMAP_VALID flag")
from the hmm tree and commit:
db30f881e2d7 ("mm/hotplug: kill is_dev_zone() usage in __remove_pages()")
from the akpm-current tree.
I fixed it up (I think - 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/memory_hotplug.c
index 6166ba5a15f3,dfab21dc33dc..000000000000
--- a/mm/memory_hotplug.c
+++ b/mm/memory_hotplug.c
@@@ -549,16 -537,14 +537,13 @@@ static void __remove_section(struct zon
* sure that pages are marked reserved and zones are adjust properly by
* calling offline_pages().
*/
- void __remove_pages(struct zone *zone, unsigned long phys_start_pfn,
+ void __remove_pages(struct zone *zone, unsigned long pfn,
unsigned long nr_pages, struct vmem_altmap *altmap)
{
- unsigned long i;
-- unsigned long map_offset = 0;
- int sections_to_remove;
++ unsigned long map_offset;
+ unsigned long nr, start_sec, end_sec;
- /* In the ZONE_DEVICE case device driver owns the memory region */
- if (is_dev_zone(zone))
- if (altmap)
-- map_offset = vmem_altmap_offset(altmap);
++ map_offset = vmem_altmap_offset(altmap);
clear_zone_contiguous(zone);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-07-04 10:55 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-04 10:55 Stephen Rothwell [this message]
2019-07-04 12:55 ` linux-next: manual merge of the akpm-current tree with the hmm tree Jason Gunthorpe
2019-07-04 13:01 ` Stephen Rothwell
2019-07-04 13:28 ` Jason Gunthorpe
2019-07-04 21:08 ` Stephen Rothwell
2019-07-04 23:29 ` Dan Williams
2019-07-05 12:08 ` Jason Gunthorpe
2019-07-07 5:04 ` Andrew Morton
2019-07-16 4:25 ` Dan Williams
-- strict thread matches above, loose matches on Subject: below --
2020-05-08 10:22 Stephen Rothwell
2019-08-22 8:14 Stephen Rothwell
2019-07-04 10:44 Stephen Rothwell
2019-07-04 10:36 Stephen Rothwell
2019-07-04 10:09 Stephen Rothwell
2019-07-04 12:44 ` Jason Gunthorpe
2019-07-04 10:01 Stephen Rothwell
2019-07-04 12:42 ` Jason Gunthorpe
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=20190704205536.32740b34@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=dan.j.williams@intel$(echo .)com \
--cc=hch@lst$(echo .)de \
--cc=jgg@mellanox$(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