Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7;
Date:   Fri, 3 Nov 2023 09:21:34 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Andrew Morton <akpm@linux-foundation.org>
Cc:     Shuah Khan <shuah@kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Mark Brown <broonie@kernel.org>,
        Shuah Khan <skhan@linuxfoundation.org>,
        Tiezhu Yang <yangtiezhu@loongson.cn>
Subject: Re: linux-next: manual merge of the kselftest tree with the
 mm-hotfixes tree
Message-ID: <20231103092134.7ddde5c3@canb.auug.org.au>
In-Reply-To: <20231019163310.6c24d6ac@canb.auug.org.au>
References: <20231019163310.6c24d6ac@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/_A+MC2CEDlPX8.Osu64lCNT";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/_A+MC2CEDlPX8.Osu64lCNT
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Thu, 19 Oct 2023 16:33:10 +1100 Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
>
> Today's linux-next merge of the kselftest tree got a conflict in:
>=20
>   tools/testing/selftests/clone3/clone3.c
>=20
> between commit:
>=20
>   fc7f04dc23db ("selftests/clone3: Fix broken test under !CONFIG_TIME_NS")
>=20
> from the mm-hotfixes tree and commit:
>=20
>   34dce23f7e40 ("selftests/clone3: Report descriptive test names")
>=20
> from the kselftest tree.
>=20
> I fixed it up (I used this file from the latter commit) and can carry the
> fix as necessary. This is now fxed 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.

This is now a conflict between the mm-hotfixes tree and Linus' tree.

--=20
Cheers,
Stephen Rothwell

--Sig_/_A+MC2CEDlPX8.Osu64lCNT
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmVEIO4ACgkQAVBC80lX
0GxtQAf/QyTWDq17gLUDulERb35r/zP9xK5HCbelCG2ew58C5Z2WuWXUzYiJUAgQ
+eTofCe59u+9kxYGnIpZ938Nk7wLuQu00dYpg4EzK2cOZ54ALg6EzWzvP57sduZA
tUj9kxMYeGjGLMdpPc/3u3DZ3b0tEhRpnDMGSPs6Fy3I16HE7Q05Asw0cH1p7dx1
iVYCmiV4S6Zgqaq8UyAFfBpZbiXUxqvLWMGPn8W6eraj9nTmVgUo/zD76CHUf/B4
lmPX0bHzAapGF4Y/bt6bjtEorUmhAzs0ojOCuWuTeGXlnHdBZSTOPhySug/Jw3SD
rvukq2IEim6rYwXLkhmHaSOHmyIbyw==
=qXVh
-----END PGP SIGNATURE-----

--Sig_/_A+MC2CEDlPX8.Osu64lCNT--