Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31;
Date:   Thu, 19 Oct 2023 16:33:10 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Shuah Khan <shuah@kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>
Cc:     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: linux-next: manual merge of the kselftest tree with the mm-hotfixes
 tree
Message-ID: <20231019163310.6c24d6ac@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/4ZotJJH.AwTb8QrpvvtBbOe";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/4ZotJJH.AwTb8QrpvvtBbOe
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the kselftest tree got a conflict in:

  tools/testing/selftests/clone3/clone3.c

between commit:

  fc7f04dc23db ("selftests/clone3: Fix broken test under !CONFIG_TIME_NS")

from the mm-hotfixes tree and commit:

  34dce23f7e40 ("selftests/clone3: Report descriptive test names")

from the kselftest tree.

I fixed it up (I used this files form the latter commit) 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

--Sig_/4ZotJJH.AwTb8QrpvvtBbOe
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmUwv5YACgkQAVBC80lX
0GwTJAf8CMiAzguvf8PPbTCw46IuQvy+fyxmoovHqDSvKBbsdPkUHIUdxL7nBH85
ePkTRSd2u2sQQwGOIz8l+fUx2GEDQaoflSMtzFSDqWLOwds4vVE1jfi7tZP86LNm
bSDPcNbhm9TZSvgMrr+VcXmo6Ykfw1eRbESiXcVxfAjFed/mpcYJi5h9ACvwtme+
l8HTAXStB4Id/YruNbK6l2oUWPZE4J95iv15Mc+ZMMBzQ07QNaqbXfONcGydVMht
SEkWNVCJQtCVrEeSMGGdYA6ynhAl5qDrxL9MUZ/D90Quekc4H174jGCJ2o5qp+k3
2IrdOP0HN81QzMaNDGVAl5aZkNhPkg==
=th37
-----END PGP SIGNATURE-----

--Sig_/4ZotJJH.AwTb8QrpvvtBbOe--