From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
"Rafael J. Wysocki" <rjw@rjwysocki•net>
Cc: Dan Williams <dan.j.williams@intel•com>,
Jonathan Cameron <Jonathan.Cameron@huawei•com>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>
Subject: linux-next: manual merge of the akpm-current tree with the pm tree
Date: Mon, 28 Sep 2020 20:24:59 +1000 [thread overview]
Message-ID: <20200928202459.419ce848@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1597 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
drivers/acpi/numa/hmat.c
between commits:
01feba590cd6 ("ACPI: Do not create new NUMA domains from ACPI static tables that are not SRAT")
4eb3723f18e9 ("ACPI: Rename acpi_map_pxm_to_online_node() to pxm_to_online_node()")
from the pm tree and commit:
b499f2c84cbf ("ACPI: HMAT: refactor hmat_register_target_device to hmem_register_device")
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 drivers/acpi/numa/hmat.c
index e7add2609c03,134bcb40b2af..000000000000
--- a/drivers/acpi/numa/hmat.c
+++ b/drivers/acpi/numa/hmat.c
@@@ -705,8 -652,11 +652,11 @@@ static void hmat_register_target_device
if (!IS_ENABLED(CONFIG_DEV_DAX_HMEM))
return;
- for (res = target->memregions.child; res; res = res->sibling)
- hmat_register_target_device(target, res);
+ for (res = target->memregions.child; res; res = res->sibling) {
- int target_nid = acpi_map_pxm_to_node(target->memory_pxm);
++ int target_nid = pxm_to_node(target->memory_pxm);
+
+ hmem_register_device(target_nid, res);
+ }
}
static void hmat_register_target(struct memory_target *target)
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2020-09-28 10:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-28 10:24 Stephen Rothwell [this message]
2020-09-28 10:40 ` linux-next: manual merge of the akpm-current tree with the pm tree Jonathan Cameron
-- strict thread matches above, loose matches on Subject: below --
2020-10-01 9:53 Stephen Rothwell
2020-10-01 17:14 ` Nathan Chancellor
2014-10-23 3:09 Stephen Rothwell
2014-10-23 13:06 ` Michal Hocko
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=20200928202459.419ce848@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Jonathan.Cameron@huawei$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=dan.j.williams@intel$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rjw@rjwysocki$(echo .)net \
/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