Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Thu, 22 Jun 2023 13:16:09 +1000
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: linux-next: manual merge of the tip tree with the mm-stable tree
Message-ID: <20230622131609.3fdf314d@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/dPngXCYV1Had5_29rk5pHpH";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/dPngXCYV1Had5_29rk5pHpH
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

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.

--=20
Cheers,
Stephen Rothwell

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 =3D pte_mkdirty(pte);
  		if (is_writable_migration_entry(entry))
- 			pte =3D pte_mkwrite(pte);
+ 			pte =3D pte_mkwrite(pte, vma);
 -		else if (pte_swp_uffd_wp(*pvmw.pte))
 +		else if (pte_swp_uffd_wp(old_pte))
  			pte =3D pte_mkuffd_wp(pte);
 =20
  		if (folio_test_anon(folio) && !is_readable_migration_entry(entry))

--Sig_/dPngXCYV1Had5_29rk5pHpH
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmSTvPkACgkQAVBC80lX
0Gx9+Af+L6Kvxcj/+tF5s2Z4bVylxonNrdsWnz1wAfY1sGIR2iTQXswKrTAh3iiW
CEuqmgJuiDN7kjFboNBB+QaFrrjdCe9jcCXOCuuVB9UhX91LNgJ+fIMkNkT+YOtt
YrL/8l9kyzPFh2LGdG2N0We1auK7nkrvAPSOLQxApjD+gEcw72UsWYMMjujGdOg/
qjIKwekmskBzshBUpqooohHV/3u6W2Wwcw733QurWH7fhr/sAeeeZ1mppkf3bpw/
8lQtNHmxIrfW8AVCH0ZsiYai7EoTnxh27CLPBNCJ7U3WvkEWUqzgtkeizA6+sJ0S
7ukeYp7Ssphfha+ZcL2HULsRuZu3sA==
=Tq32
-----END PGP SIGNATURE-----

--Sig_/dPngXCYV1Had5_29rk5pHpH--