linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: manual merge of the akpm-current tree with the pm tree
@ 2020-09-28 10:24 Stephen Rothwell
  2020-09-28 10:40 ` Jonathan Cameron
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2020-09-28 10:24 UTC (permalink / raw)
  To: Andrew Morton, Rafael J. Wysocki
  Cc: Dan Williams, Jonathan Cameron, Linux Next Mailing List,
	Linux Kernel Mailing List

[-- 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 --]

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the akpm-current tree with the pm tree
  2020-09-28 10:24 linux-next: manual merge of the akpm-current tree with the pm tree Stephen Rothwell
@ 2020-09-28 10:40 ` Jonathan Cameron
  0 siblings, 0 replies; 6+ messages in thread
From: Jonathan Cameron @ 2020-09-28 10:40 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Andrew Morton, Rafael J. Wysocki, Dan Williams,
	Linux Next Mailing List, Linux Kernel Mailing List

On Mon, 28 Sep 2020 20:24:59 +1000
Stephen Rothwell <sfr@canb.auug.org.au> 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


^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the akpm-current tree with the pm tree
  2020-10-01  9:53 Stephen Rothwell
@ 2020-10-01 17:14 ` Nathan Chancellor
  0 siblings, 0 replies; 6+ messages in thread
From: Nathan Chancellor @ 2020-10-01 17:14 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Andrew Morton, Rafael J. Wysocki, Linux Kernel Mailing List,
	Linux Next Mailing List, Dan Williams

On Thu, Oct 01, 2020 at 07:53:53PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the akpm-current tree got a conflict in:
> 
>   include/acpi/acpi_numa.h
> 
> between commit:
> 
>   4849bc777049 ("ACPI / NUMA: Add stub function for pxm_to_node()")
> 
> from the pm tree and commit:
> 
>   623347c1b949 ("x86/numa: cleanup configuration dependent command-line options")
> 
> 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 include/acpi/acpi_numa.h
> index 09eb3bc20ff5,0e9302285f14..000000000000
> --- a/include/acpi/acpi_numa.h
> +++ b/include/acpi/acpi_numa.h
> @@@ -23,9 -23,16 +23,20 @@@ extern void bad_srat(void)
>   extern int srat_disabled(void);
>   
>   #else				/* CONFIG_ACPI_NUMA */
>  +static inline int pxm_to_node(int pxm)
>  +{
>  +	return 0;
>  +}
> + static inline void disable_srat(void)
> + {
> + }
>   #endif				/* CONFIG_ACPI_NUMA */
> + 
> + #ifdef CONFIG_ACPI_HMAT
> + extern void disable_hmat(void);
> + #else				/* CONFIG_ACPI_HMAT */
> + static inline void disable_hmat(void)
> + {
> + }
> + #endif				/* CONFIG_ACPI_HMAT */
>   #endif				/* __ACP_NUMA_H */

Thanks Stephen, this was expected. The resolution looks good to me and
is what I had locally.

Cheers,
Nathan

^ permalink raw reply	[flat|nested] 6+ messages in thread
* linux-next: manual merge of the akpm-current tree with the pm tree
@ 2020-10-01  9:53 Stephen Rothwell
  2020-10-01 17:14 ` Nathan Chancellor
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2020-10-01  9:53 UTC (permalink / raw)
  To: Andrew Morton, Rafael J. Wysocki
  Cc: Linux Kernel Mailing List, Linux Next Mailing List,
	Nathan Chancellor, Dan Williams

[-- Attachment #1: Type: text/plain, Size: 1412 bytes --]

Hi all,

Today's linux-next merge of the akpm-current tree got a conflict in:

  include/acpi/acpi_numa.h

between commit:

  4849bc777049 ("ACPI / NUMA: Add stub function for pxm_to_node()")

from the pm tree and commit:

  623347c1b949 ("x86/numa: cleanup configuration dependent command-line options")

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 include/acpi/acpi_numa.h
index 09eb3bc20ff5,0e9302285f14..000000000000
--- a/include/acpi/acpi_numa.h
+++ b/include/acpi/acpi_numa.h
@@@ -23,9 -23,16 +23,20 @@@ extern void bad_srat(void)
  extern int srat_disabled(void);
  
  #else				/* CONFIG_ACPI_NUMA */
 +static inline int pxm_to_node(int pxm)
 +{
 +	return 0;
 +}
+ static inline void disable_srat(void)
+ {
+ }
  #endif				/* CONFIG_ACPI_NUMA */
+ 
+ #ifdef CONFIG_ACPI_HMAT
+ extern void disable_hmat(void);
+ #else				/* CONFIG_ACPI_HMAT */
+ static inline void disable_hmat(void)
+ {
+ }
+ #endif				/* CONFIG_ACPI_HMAT */
  #endif				/* __ACP_NUMA_H */

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the akpm-current tree with the pm tree
  2014-10-23  3:09 Stephen Rothwell
@ 2014-10-23 13:06 ` Michal Hocko
  0 siblings, 0 replies; 6+ messages in thread
From: Michal Hocko @ 2014-10-23 13:06 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Andrew Morton, Rafael J. Wysocki, linux-next, linux-kernel

On Thu 23-10-14 14:09:05, Stephen Rothwell wrote:
> Hi Andrew,
> 
> Today's linux-next merge of the akpm-current tree got a conflict in
> include/linux/oom.h, kernel/power/process.c and mm/oom_kill.c between
> commit 5695be142e20 ("OOM, PM: OOM killed task shouldn't escape PM
> suspend") from the pm tree and commit e039ae202d34 ("OOM, PM: OOM
> killed task cannot escape PM suspend") from the akpm-current tree.
> 
> I fixed it up (the pm tree version seems to be newer, so I used that)
> and can carry the fix as necessary (no action is required).

Yes that is correct. I thought Andrew has dropped the previous version
of the patch from his tree. Rafael has merged his in the meantime.

Thanks!
-- 
Michal Hocko
SUSE Labs

^ permalink raw reply	[flat|nested] 6+ messages in thread
* linux-next: manual merge of the akpm-current tree with the pm tree
@ 2014-10-23  3:09 Stephen Rothwell
  2014-10-23 13:06 ` Michal Hocko
  0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2014-10-23  3:09 UTC (permalink / raw)
  To: Andrew Morton, Rafael J. Wysocki; +Cc: linux-next, linux-kernel, Michal Hocko

[-- Attachment #1: Type: text/plain, Size: 565 bytes --]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
include/linux/oom.h, kernel/power/process.c and mm/oom_kill.c between
commit 5695be142e20 ("OOM, PM: OOM killed task shouldn't escape PM
suspend") from the pm tree and commit e039ae202d34 ("OOM, PM: OOM
killed task cannot escape PM suspend") from the akpm-current tree.

I fixed it up (the pm tree version seems to be newer, so I used that)
and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-10-01 17:14 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-28 10:24 linux-next: manual merge of the akpm-current tree with the pm tree Stephen Rothwell
2020-09-28 10:40 ` 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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).