Received-SPF: pass (google.com: domain of linux-kernel+bounces-175070-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Fri, 10 May 2024 09:22:02 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Jakub Kicinski <kuba@kernel.org>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Tao Su <tao1.su@linux.intel.com>
Subject: linux-next: manual merge of the mm tree with Linus' tree
Message-ID: <20240510092202.5d7df5a6@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/UMbiVPOBNRoNU7ZDd1PCN63";
 protocol="application/pgp-signature"; micalg=pgp-sha256

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

Hi all,

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

  tools/testing/selftests/kselftest_harness.h

between commit:

  caed8eba2215 ("selftests: kselftest_harness: fix Clang warning about zero=
-length format")

from Linus' tree and commit:

  89bc631bb87f ("Revert "selftests/harness: remove use of LINE_MAX"")

from the mm-nonmm-unstable branch of the mm 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 tools/testing/selftests/kselftest_harness.h
index d98702b6955d,7eca89267962..000000000000
--- a/tools/testing/selftests/kselftest_harness.h
+++ b/tools/testing/selftests/kselftest_harness.h
@@@ -1208,8 -1201,7 +1204,7 @@@ void __run_test(struct __fixture_metada
  		diagnostic =3D "unknown";
 =20
  	ksft_test_result_code(t->exit_code, test_name,
 -			      diagnostic ? "%s" : "", diagnostic);
 +			      diagnostic ? "%s" : NULL, diagnostic);
- 	free(test_name);
  }
 =20
  static int test_harness_run(int argc, char **argv)

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

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmY9WpoACgkQAVBC80lX
0Gzx7Af/csdy9gKml+ESzh/6FujKznPX23xqzbgVonDIEHEwjIRCM0qiNk2mKseG
sa4KgquC3dpzCnwa6CUwFcwZ6gvnZdNmvyWKkDN9NIKaHNDW31eRF3S2HI0b6+zZ
eTcwhhL5NadKYHzNjnSDG5txe02FpgpbLJROLSW0TQgOXLY6d4qs0EXPLb8nK7KI
Fu2T1WmIb0W3VQlHaeZ2JWUeJX6lR+hCrUED04XW8zifJllsoa+Oz82Sn0t4FoD/
o47P5lLejs8Gr7t8yaBhtQYy4AGhLJ4DCsSBibZynPygoNa4eQTbKJiLTF08Crkw
cNBJuYAkle0b6ZXVo5IJdnsEI4gkxg==
=dSVX
-----END PGP SIGNATURE-----

--Sig_/UMbiVPOBNRoNU7ZDd1PCN63--