Hi all,
After merging the random tree, today's linux-next build (x86_64
allmodconfig) failed like this:
Caused by commit
38d1a9d296c8 ("random: Do not include <linux/prandom.h> in <linux/random.h>")
interacting with commit
5a90b60db5e6 ("drm/xe: Add a xe_bo subtest for shrinking / swapping")
from the drm-xe tree.
I have applied the following merge fix patch for today.
From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Tue, 1 Oct 2024 13:33:48 +1000
Subject: [PATCH] fix up for "random: Do not include <linux/prandom.h> in <linux/random.h>"
interacting with commit
5a90b60db5e6 ("drm/xe: Add a xe_bo subtest for shrinking / swapping")
from the drm-xe tree.
Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/xe/tests/xe_bo.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/xe/tests/xe_bo.c b/drivers/gpu/drm/xe/tests/xe_bo.c
index 7d3fd720478b..3a14b70f12b8 100644
--- a/drivers/gpu/drm/xe/tests/xe_bo.c
+++ b/drivers/gpu/drm/xe/tests/xe_bo.c
@@ -7,7 +7,7 @@
#include <kunit/visibility.h>
#include <linux/iosys-map.h>
-#include <linux/random.h>
+#include <linux/prandom.h>
#include <linux/swap.h>
#include <uapi/linux/sysinfo.h>
--
2.45.2
--
Cheers,
Stephen Rothwell
Attachment:
pgpBnl83LJ6Cd.pgp
Description: OpenPGP digital signature
