linux-next: manual merge of the mm tree with Linus' tree

Stephen Rothwell
2024-05-09T23:22:08Z

[-- Attachment #1: Type: text/plain, Size: 1350 bytes --]

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.

--
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 = "unknown";

ksft_test_result_code(t->exit_code, test_name,
- diagnostic ? "%s" : "", diagnostic);
+ diagnostic ? "%s" : NULL, diagnostic);
- free(test_name);
}

static int test_harness_run(int argc, char **argv)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]