From: Andrew Morton <akpm@linux-foundation.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Ralf Baechle <ralf@linux-mips.org>,
James Hogan <jhogan@kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Bibo Mao <maobibo@loongson.cn>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
Johannes Weiner <hannes@cmpxchg.org>
Subject: Re: linux-next: manual merge of the akpm-current tree with the mips tree
Date: Fri, 29 May 2020 14:15:46 -0700 [thread overview]
Message-ID: <20200529141546.8fcc75eecdba416a26e269cf@linux-foundation.org> (raw)
In-Reply-To: <20200528192943.2bb04a5e@canb.auug.org.au>
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.
next prev parent reply other threads:[~2020-05-29 21:15 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-28 9:29 linux-next: manual merge of the akpm-current tree with the mips tree Stephen Rothwell
2020-05-29 21:15 ` Andrew Morton [this message]
2020-05-29 22:55 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2019-05-03 8:59 Stephen Rothwell
2018-08-22 2:02 Stephen Rothwell
2016-02-15 5:03 Stephen Rothwell
2015-06-03 9:33 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200529141546.8fcc75eecdba416a26e269cf@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=hannes@cmpxchg.org \
--cc=jhogan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=maobibo@loongson.cn \
--cc=ralf@linux-mips.org \
--cc=sfr@canb.auug.org.au \
--cc=tsbogend@alpha.franken.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).