Subject: linux-next: manual merge of the akpm-current tree with the pm tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 28 Sep 2020 20:24:59 +1000

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)