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

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

[Stephen Rothwell]

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

Hi all,

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

  mm/memory.c

between commit:

  7df676974359 ("mm/memory.c: Update local TLB if PTE entry exists")

from the mips tree and commit:

  e325f89fdd69 ("mm: memcontrol: convert anon and file-thp to new mem_cgroup_charge() API")

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/memory.c
index c7c8960bdd1e,8d52a91d707b..000000000000
--- a/mm/memory.c
+++ b/mm/memory.c
@@@ -2752,9 -2748,6 +2749,8 @@@ static vm_fault_t wp_page_copy(struct v
  		/* Free the old page.. */
  		new_page = old_page;
  		page_copied = 1;
 +	} else {
 +		update_mmu_tlb(vma, vmf->address, vmf->pte);
- 		mem_cgroup_cancel_charge(new_page, memcg, false);
  	}
  
  	if (new_page)

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

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

[Andrew Morton]

On Thu, 28 May 2020 19:29:43 +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:
> 
>   mm/memory.c
> 
> between commit:
> 
>   7df676974359 ("mm/memory.c: Update local TLB if PTE entry exists")
> 
> from the mips tree and commit:
> 
>   e325f89fdd69 ("mm: memcontrol: convert anon and file-thp to new mem_cgroup_charge() API")
> 
> 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.
> 
> --- a/mm/memory.c
> +++ b/mm/memory.c
> @@@ -2752,9 -2748,6 +2749,8 @@@ static vm_fault_t wp_page_copy(struct v
>   		/* Free the old page.. */
>   		new_page = old_page;
>   		page_copied = 1;
>  +	} else {
>  +		update_mmu_tlb(vma, vmf->address, vmf->pte);
> - 		mem_cgroup_cancel_charge(new_page, memcg, false);
>   	}
>   
>   	if (new_page)

We decided that the update_mmu_tlb() call is no longer needed here, so
there is no need to re-add it when resolving this.

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

[Stephen Rothwell]

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

Hi Andrew,

On Fri, 29 May 2020 14:15:46 -0700 Andrew Morton <akpm@linux-foundation.org> wrote:
>
> On Thu, 28 May 2020 19:29:43 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > 
> > --- a/mm/memory.c
> > +++ b/mm/memory.c
> > @@@ -2752,9 -2748,6 +2749,8 @@@ static vm_fault_t wp_page_copy(struct v
> >   		/* Free the old page.. */
> >   		new_page = old_page;
> >   		page_copied = 1;
> >  +	} else {
> >  +		update_mmu_tlb(vma, vmf->address, vmf->pte);
> > - 		mem_cgroup_cancel_charge(new_page, memcg, false);
> >   	}
> >   
> >   	if (new_page)  
> 
> We decided that the update_mmu_tlb() call is no longer needed here, so
> there is no need to re-add it when resolving this.

OK, I have fixed up my merge resolution to remove those 2 lines.
-- 
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 mips tree

[Stephen Rothwell]

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

Hi all,

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

  arch/mips/kernel/setup.c

between commit:

  b93ddc4f9156 ("mips: Reserve memory for the kernel image resources")

from the mips tree and commit:

  68c7c323926b ("mips: replace CONFIG_DEBUG_KERNEL with CONFIG_DEBUG_MISC")

from the akpm-current tree.

I fixed it up (the former removed the line changed by the latter, so I
did that) 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 mips tree

[Stephen Rothwell]

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

Hi all,

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

  arch/Kconfig

between commit:

  04f264d3a8b0 ("compiler.h: Allow arch-specific asm/compiler.h")

from the mips tree and commit:

  7358e371b0ef ("arch: enable relative relocations for arm64, power and x86")

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/Kconfig
index 526a57457594,4426e9687d89..000000000000
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@@ -848,14 -841,16 +848,24 @@@ config REFCOUNT_FUL
  	  against various use-after-free conditions that can be used in
  	  security flaw exploits.
  
 +config HAVE_ARCH_COMPILER_H
 +	bool
 +	help
 +	  An architecture can select this if it provides an
 +	  asm/compiler.h header that should be included after
 +	  linux/compiler-*.h in order to override macro definitions that those
 +	  headers generally provide.
 +
+ config HAVE_ARCH_PREL32_RELOCATIONS
+ 	bool
+ 	help
+ 	  May be selected by an architecture if it supports place-relative
+ 	  32-bit relocations, both in the toolchain and in the module loader,
+ 	  in which case relative references can be used in special sections
+ 	  for PCI fixup, initcalls etc which are only half the size on 64 bit
+ 	  architectures, and don't require runtime relocation on relocatable
+ 	  kernels.
+ 
  source "kernel/gcov/Kconfig"
  
  source "scripts/gcc-plugins/Kconfig"

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

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

[Stephen Rothwell]

Hi Andrew,

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

  arch/mips/Kconfig

between commit:

  d96927dfa449 ("MIPS: Select CONFIG_HANDLE_DOMAIN_IRQ and make it work.")

from the mips tree and commit:

  29afe44a7fbe ("printk/nmi: generic solution for safe printk in NMI")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell

diff --cc arch/mips/Kconfig
index e4df64c411b7,56f57816613e..000000000000
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@@ -62,7 -62,7 +62,8 @@@ config MIP
  	select HAVE_IRQ_TIME_ACCOUNTING
  	select GENERIC_TIME_VSYSCALL
  	select ARCH_CLOCKSOURCE_DATA
 +	select HANDLE_DOMAIN_IRQ
+ 	select HAVE_NMI
  
  menu "Machine selection"
  

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

[Stephen Rothwell]

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

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
MAINTAINERS between commit d4b6c2755ce1 ("MAINTAINERS: Add Broadcom
BCM47xx entry") from the  tree and commit b93598277db2 ("MAINTAINERS:
remove section BROADCOM BCM33XX MIPS ARCHITECTURE") from the
akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

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

diff --cc MAINTAINERS
index 5f620640c34d,6de7364e67a4..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2211,22 -2153,6 +2211,14 @@@ T:	git git://git.kernel.org/pub/scm/lin
  S:	Maintained
  N:	bcm2835
  
- BROADCOM BCM33XX MIPS ARCHITECTURE
- M:	Kevin Cernekee <cernekee@gmail.com>
- L:	linux-mips@linux-mips.org
- S:	Maintained
- F:	arch/mips/bcm3384/*
- F:	arch/mips/include/asm/mach-bcm3384/*
- F:	arch/mips/kernel/*bmips*
- 
 +BROADCOM BCM47XX MIPS ARCHITECTURE
 +M:	Hauke Mehrtens <hauke@hauke-m.de>
 +M:	Rafał Miłecki <zajec5@gmail.com>
 +L:	linux-mips@linux-mips.org
 +S:	Maintained
 +F:	arch/mips/bcm47xx/*
 +F:	arch/mips/include/asm/mach-bcm47xx/*
 +
  BROADCOM BCM5301X ARM ARCHITECTURE
  M:	Hauke Mehrtens <hauke@hauke-m.de>
  L:	linux-arm-kernel@lists.infradead.org
@@@ -2322,14 -2247,8 +2314,14 @@@ M:	Ray Jui <rjui@broadcom.com
  L:	bcm-kernel-feedback-list@broadcom.com
  S:	Supported
  F:	drivers/gpio/gpio-bcm-kona.c
- F:	Documentation/devicetree/bindings/gpio/gpio-bcm-kona.txt
+ F:	Documentation/devicetree/bindings/gpio/brcm,kona-gpio.txt
  
 +BROADCOM STB NAND FLASH DRIVER
 +M:	Brian Norris <computersforpeace@gmail.com>
 +L:	linux-mtd@lists.infradead.org
 +S:	Maintained
 +F:	drivers/mtd/nand/brcmnand/
 +
  BROADCOM SPECIFIC AMBA DRIVER (BCMA)
  M:	Rafał Miłecki <zajec5@gmail.com>
  L:	linux-wireless@vger.kernel.org

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