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

Hi Andrew, On Fri, 29 May 2020 14:15:46 -0700 Andrew Morton wrote: > > On Thu, 28 May 2020 19:29:43 +1000 Stephen Rothwell > 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.

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

On Thu, 28 May 2020 19:29:43 +1000 Stephen Rothwell 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: >

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

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()

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

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_MI

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

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

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

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")

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

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.