Hi all,
Today's linux-next merge of the random tree got a conflict in:
drivers/gpu/drm/selftests/test-drm_buddy.c
between commit:
932da861956a ("drm: selftest: convert drm_buddy selftest to KUnit")
from Linus' tree and commit:
87b2389e69dd ("treewide: use get_random_u32() when possible")
from the random tree.
I fixed it up (I deleted the file and applied the following merge fix
patch) 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.
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Fri, 7 Oct 2022 15:46:52 +1100
Subject: [PATCH] drm: selftest: fix up for "convert drm_buddy selftest to KUnit"
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/tests/drm_buddy_test.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/tests/drm_buddy_test.c b/drivers/gpu/drm/tests/drm_buddy_test.c
index 7a2b2d6bc3fe..62f69589a72d 100644
--- a/drivers/gpu/drm/tests/drm_buddy_test.c
+++ b/drivers/gpu/drm/tests/drm_buddy_test.c
@@ -729,7 +729,7 @@ static void drm_test_buddy_alloc_limit(struct kunit *test)
static int drm_buddy_init_test(struct kunit *test)
{
while (!random_seed)
- random_seed = get_random_int();
+ random_seed = get_random_u32();
return 0;
}
--
2.35.1
--
Cheers,
Stephen Rothwell
Attachment:
pgpKEQbXspOMU.pgp
Description: OpenPGP digital signature
