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:   Tue, 11 Jul 2023 10:55:38 +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: Re: linux-next: manual merge of the tip tree with the mm-stable
 tree
Message-ID: <20230711105538.2e941593@canb.auug.org.au>
In-Reply-To: <20230622131609.3fdf314d@canb.auug.org.au>
References: <20230622131609.3fdf314d@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/bBa/Hh7hroM.Z8bJmHCgiEF";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/bBa/Hh7hroM.Z8bJmHCgiEF
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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:
>=20
>   mm/migrate.c
>=20
> between commit:
>=20
>   c33c794828f2 ("mm: ptep_get() conversion")
>=20
> from the mm-stable tree and commit:
>=20
>   23a219c1860b ("mm: Make pte_mkwrite() take a VMA")
>=20
> from the tip tree.
>=20
> 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
> 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))

This is now a conflict between the tip tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/bBa/Hh7hroM.Z8bJmHCgiEF
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmSsqIoACgkQAVBC80lX
0GzPZgf8CUpuNV/f7OrZlANxJmbZARnQ0fyoVgNxVARKNEu6zH+huXt4fuhcZKft
rsGI/wMExltAt/ldr++EDzVJ76H7FD0bjft2uFCJfVQRSpV2RD1lnaESpPjJrECh
91UffgfQWbF4ZimHWGxqFCBwAggjLrb/720655G3JDsNDWPo0KQVrJDS5vyEBjnh
uFlSXrFudSgkG9rG3qWw1+VIcXcEhthdM8ykb3PIkXE8Ck+kjfCyNj2hth3J9jOK
EjLEp9eWhOkcfRWhUPm6DGdu2PPkD+lZH3GR9ZLGBibltijABdhZnFL8V4Z4cW7r
OZj6b6SNcvRd7A9tSGQFmr6+om5Ckw==
=ePuI
-----END PGP SIGNATURE-----

--Sig_/bBa/Hh7hroM.Z8bJmHCgiEF--