Received-SPF: pass (google.com: domain of linux-kernel+bounces-179253-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Wed, 15 May 2024 09:05:20 +1000
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>, Nathan Chancellor <nathan@kernel.org>, Ryan
 Roberts <ryan.roberts@arm.com>, Shuah Khan <skhan@linuxfoundation.org>
Subject: Re: linux-next: manual merge of the kselftest tree with the mm tree
Message-ID: <20240515090520.64d10d05@canb.auug.org.au>
In-Reply-To: <20240426154414.4d408fd7@canb.auug.org.au>
References: <20240426154414.4d408fd7@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/7niloPDGA7G/gbEQ2VHM=ef";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/7niloPDGA7G/gbEQ2VHM=ef
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

On Fri, 26 Apr 2024 15:44:14 +1000 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/mm/soft-dirty.c
>=20
> between commit:
>=20
>   258ff696db6b ("selftests/mm: soft-dirty should fail if a testcase fails=
")
>=20
> from the mm-unstable branch of the mm tree and commit:
>=20
>   e6162a96c81d ("selftests/mm: ksft_exit functions do not return")
>=20
> from the kselftest tree.
>=20
> I fixed it up (I used the former) 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.

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

--=20
Cheers,
Stephen Rothwell

--Sig_/7niloPDGA7G/gbEQ2VHM=ef
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmZD7jAACgkQAVBC80lX
0GyiAgf+OCW31GgkHwyWhLANshWwa6jnhh80C9HWB5v+2bXxyXfUbgPEf7ksaWE5
aqBGFMGttHNiDPlRczBwBoMpznFLYerxNSf1fTP/IZEeJ+2ujyVXKnh40wwPd0QV
hkO+dfyrLL7+ruafeo9juv+xT41nGyx1FXpxLCm02rn4aRBYiqpeW9GQhOjpuEoN
vfX4G2L0Sop8o9sjax/hqagNPDP/1W4yKQZwph/UcU55t6Uh+qQpzuh22WX7Acwh
sDv7i09FodUwFVdaHZ4wHLKASyUh0pS3V9UIgHMzJrQZY5uuoChu+X26cstj32Xp
qKTd9AAVG2dZnlNTQJpfe81yROGzPA==
=Ijr+
-----END PGP SIGNATURE-----

--Sig_/7niloPDGA7G/gbEQ2VHM=ef--