From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>,
David Miller <davem@davemloft•net>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Yu Zhao <yuzhao@google•com>, Khalid Aziz <khalid.aziz@oracle•com>
Subject: linux-next: manual merge of the akpm-current tree with the sparc-next tree
Date: Mon, 19 Mar 2018 17:43:55 +1100 [thread overview]
Message-ID: <20180319174355.02725f8f@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1299 bytes --]
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
mm/memory.c
between commit:
ca827d55ebaa ("mm, swap: Add infrastructure for saving page metadata on swap")
from the sparc-next tree and commit:
f2986f002986 ("mm: don't expose page to fast gup before it's ready")
from the akpm-current tree.
I fixed it up (please check, I just did the obvious fix 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 aed37325d94e,e0ae4999c824..000000000000
--- a/mm/memory.c
+++ b/mm/memory.c
@@@ -3052,8 -3035,6 +3035,7 @@@ int do_swap_page(struct vm_fault *vmf
flush_icache_page(vma, page);
if (pte_swp_soft_dirty(vmf->orig_pte))
pte = pte_mksoft_dirty(pte);
- set_pte_at(vma->vm_mm, vmf->address, vmf->pte, pte);
+ arch_do_swap_page(vma->vm_mm, vma, vmf->address, pte, vmf->orig_pte);
vmf->orig_pte = pte;
/* ksm created a completely new copy */
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2018-03-19 6:43 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20180319174355.02725f8f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=davem@davemloft$(echo .)net \
--cc=khalid.aziz@oracle$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=yuzhao@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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