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

From: Stephen Rothwell <[email-masked]>
Date: Sat, 30 May 2020 08:55:24 +1000

Hi Andrew,

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