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

From: Jonathan Cameron <[email-masked]>
Date: Mon, 28 Sep 2020 11:40:46 +0100

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

> 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.
> 

Looks like the correct conflict fix to me.

Thanks

Jonathan