From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@redhat•com>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Andrew Morton <akpm@linux-foundation•org>
Cc: Dave Hansen <dave.hansen@linux•intel.com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Rick Edgecombe <rick.p.edgecombe@intel•com>,
Ryan Roberts <ryan.roberts@arm•com>
Subject: Re: linux-next: manual merge of the tip tree with the mm-stable tree
Date: Tue, 11 Jul 2023 10:55:38 +1000 [thread overview]
Message-ID: <20230711105538.2e941593@canb.auug.org.au> (raw)
In-Reply-To: <20230622131609.3fdf314d@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1488 bytes --]
Hi all,
On Thu, 22 Jun 2023 13:16:09 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> mm/migrate.c
>
> between commit:
>
> c33c794828f2 ("mm: ptep_get() conversion")
>
> from the mm-stable tree and commit:
>
> 23a219c1860b ("mm: Make pte_mkwrite() take a VMA")
>
> from the tip 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.
>
> diff --cc mm/migrate.c
> index 6f4066425d47,8b46b722f1a4..000000000000
> --- a/mm/migrate.c
> +++ b/mm/migrate.c
> @@@ -220,8 -219,8 +220,8 @@@ static bool remove_migration_pte(struc
> if (folio_test_dirty(folio) && is_migration_entry_dirty(entry))
> pte = pte_mkdirty(pte);
> if (is_writable_migration_entry(entry))
> - pte = pte_mkwrite(pte);
> + pte = pte_mkwrite(pte, vma);
> - else if (pte_swp_uffd_wp(*pvmw.pte))
> + else if (pte_swp_uffd_wp(old_pte))
> pte = pte_mkuffd_wp(pte);
>
> if (folio_test_anon(folio) && !is_readable_migration_entry(entry))
This is now a conflict between the tip tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2023-07-11 0:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-22 3:16 linux-next: manual merge of the tip tree with the mm-stable tree Stephen Rothwell
2023-07-11 0:55 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-08-15 4:19 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=20230711105538.2e941593@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=dave.hansen@linux$(echo .)intel.com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@redhat$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=rick.p.edgecombe@intel$(echo .)com \
--cc=ryan.roberts@arm$(echo .)com \
--cc=tglx@linutronix$(echo .)de \
/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