Received-SPF: pass (google.com: domain of linux-kernel+bounces-150864-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99;
Date: Fri, 19 Apr 2024 09:32:22 +1000
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>, David Miller
 <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni
 <pabeni@redhat.com>
Cc: Edward Liaw <edliaw@google.com>, Networking <netdev@vger.kernel.org>,
 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next
 Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the mm-hotfixes tree with Linus' tree
Message-ID: <20240419093222.5a901a84@canb.auug.org.au>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/Lo7x+b/tFAF1roENO8l.nWi";
 protocol="application/pgp-signature"; micalg=pgp-sha256

--Sig_/Lo7x+b/tFAF1roENO8l.nWi
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi all,

Today's linux-next merge of the mm-hotfixes 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:

  52124c13ec1f ("selftests/harness: remove use of LINE_MAX")

from the mm-hotfixes-unstable branch of the mm-hotfixes 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 ba3ddeda24bf,f0ae1f6466db..000000000000
--- a/tools/testing/selftests/kselftest_harness.h
+++ b/tools/testing/selftests/kselftest_harness.h
@@@ -1205,7 -1205,8 +1208,8 @@@ 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_/Lo7x+b/tFAF1roENO8l.nWi
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmYhrYYACgkQAVBC80lX
0GxIXAf9GkUydFR4L+GRsO3dV79ZUMzgzwRca1uFwzNSaJkaO54D90SFXWhPecod
1NY7M72Lg9cNT6PqpO6xQ9zPnWjdWlU1fAdZMuZx+Li/MFzmnqBW4S73F1q6HhCx
LikcWI939KGsPG9uBbQ0lxQnG+JBNNp+z7Wny3ypLxOp5e2oqFkySwzWFgv+BS+x
vH9a+BAuBXOzZv/a3heyAmOLx9sNzOAT0HFRnUrEb+dSAVH0wLD9uAdXqCbBQpgd
WtcsCPewuKXVXnKd6GLelrG78GhhED/ezFejgxzDSrJCpcWGISzLO2lR7V7ijIRB
x8POmTps9e6xUxr+8xAYqA9cFrYtuw==
=wSr3
-----END PGP SIGNATURE-----

--Sig_/Lo7x+b/tFAF1roENO8l.nWi--