linux-next: manual merge of the akpm-current tree with the asm-generic tree

linux-next: manual merge of the akpm-current tree with the asm-generic tree

[Stephen Rothwell]

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

Hi all,

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

  arch/tile/kernel/pci_gx.c

between commit:

  0373506fe580 ("arch: remove tile port")

from the asm-generic tree and commit:

  4b36a05ab086 ("arch/tile/kernel/pci_gx.c: make setup_pcie_rc_delay() __init")

from the akpm-current tree.

I fixed it up (I just removed the file) 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

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

Re: linux-next: manual merge of the akpm-current tree with the asm-generic tree

[Stephen Rothwell]

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

Hi all,

On Thu, 3 Mar 2022 19:17:41 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> Today's linux-next merge of the akpm-current tree got a conflict in:
> 
>   arch/nds32/mm/init.c
> 
> between commit:
> 
>   9f15ac318b83 ("nds32: Remove the architecture")
> 
> from the asm-generic tree and commit:
> 
>   311ca692496e ("mm: remove mmu_gathers storage from remaining architectures")
> 
> from the akpm-current tree.
> 
> I fixed it up (I removed the file) 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.

This is now a conflict between the asm-generic tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

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

linux-next: manual merge of the akpm-current tree with the asm-generic tree

[Stephen Rothwell]

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

Hi all,

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

  arch/nds32/mm/init.c

between commit:

  9f15ac318b83 ("nds32: Remove the architecture")

from the asm-generic tree and commit:

  311ca692496e ("mm: remove mmu_gathers storage from remaining architectures")

from the akpm-current tree.

I fixed it up (I removed the file) 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

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

linux-next: manual merge of the akpm-current tree with the asm-generic tree

[Stephen Rothwell]

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

Hi all,

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

  arch/sh/include/asm/Kbuild

between commit:

  2b3c5a99d5f3 ("sh: generate uapi header and syscall table header files")

from the asm-generic tree and commit:

  548211e87ba0 ("sh: include: convert to SPDX identifiers")

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 arch/sh/include/asm/Kbuild
index b15caf34813a,f4440779deab..000000000000
--- a/arch/sh/include/asm/Kbuild
+++ b/arch/sh/include/asm/Kbuild
@@@ -1,4 -1,4 +1,5 @@@
+ # SPDX-License-Identifier: GPL-2.0
 +generated-y += syscall_table.h
  generic-y += compat.h
  generic-y += current.h
  generic-y += delay.h

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

linux-next: manual merge of the akpm-current tree with the asm-generic tree

[Stephen Rothwell]

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

Hi all,

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

  arch/tile/mm/mmap.c

between commit:

  0373506fe580 ("arch: remove tile port")

from the asm-generic tree and commit:

  69ab63fcaa9b ("exec: pass stack rlimit into mm layout functions")

from the akpm-current tree.

I fixed it up (I just removed the file) 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

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

linux-next: manual merge of the akpm-current tree with the asm-generic tree

[Stephen Rothwell]

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

Hi Andrew,

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

  arch/score/mm/cache.c

between commit:

  b8c9c8f0190f ("arch: remove score port")

from the asm-generic tree and commit:

  32a8c02959cd ("mm: fix races between swapoff and flush dcache")

from the akpm-current tree.

I fixed it up (I just removed the file) 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

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

linux-next: manual merge of the akpm-current tree with the asm-generic tree

[Stephen Rothwell]

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

Hi Andrew,

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

  mm/sparse.c

between commit:

  123d3239fb65 ("mm: remove obsolete alloc_remap()")

from the asm-generic tree and commit:

  9c6a14b65e50 ("mm/sparse.c: optimize memmap allocation during sparse_init()")

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 mm/sparse.c
index 65bb52599f90,873617fab5ff..000000000000
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@@ -441,7 -454,21 +450,8 @@@ void __init sparse_mem_maps_populate_no
  	void *map;
  	unsigned long pnum;
  	unsigned long size = sizeof(struct page) * PAGES_PER_SECTION;
+ 	int idx_present;
  
 -	map = alloc_remap(nodeid, size * map_count);
 -	if (map) {
 -		idx_present = 0;
 -		for (pnum = pnum_begin; pnum < pnum_end; pnum++) {
 -			if (!present_section_nr(pnum))
 -				continue;
 -			map_map[idx_present] = map;
 -			map += size;
 -			idx_present++;
 -		}
 -		return;
 -	}
 -
  	size = PAGE_ALIGN(size);
  	map = memblock_virt_alloc_try_nid_raw(size * map_count,
  					      PAGE_SIZE, __pa(MAX_DMA_ADDRESS),

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