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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20200530085524.4100c6b7@canb.auug.org.au>
Date:   Sat, 30 May 2020 08:55:24 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>
Cc:     Ralf Baechle <ralf@...ux-mips.org>,
        James Hogan <jhogan@...nel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Bibo Mao <maobibo@...ngson.cn>,
        Thomas Bogendoerfer <tsbogend@...ha.franken.de>,
        Johannes Weiner <hannes@...xchg.org>
Subject: 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 <akpm@...ux-foundation.org> wrote:
>
> On Thu, 28 May 2020 19:29:43 +1000 Stephen Rothwell <sfr@...b.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

Content of type "application/pgp-signature" skipped