Re: linux-next: build failure after merge of the random tree

[Stephen Rothwell]

Hi all,

On Tue, 1 Oct 2024 13:44:23 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> 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.

The patch is now:

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 cd811aa2b227..3e0ae40ebbd2 100644
--- a/drivers/gpu/drm/xe/tests/xe_bo.c
+++ b/drivers/gpu/drm/xe/tests/xe_bo.c
@@ -8,7 +8,7 @@
 
 #include <linux/iosys-map.h>
 #include <linux/math64.h>
-#include <linux/random.h>
+#include <linux/prandom.h>
 #include <linux/swap.h>
 
 #include <uapi/linux/sysinfo.h>


-- 
Cheers,
Stephen Rothwell

Attachment: pgpIokxYds5LG.pgp
Description: OpenPGP digital signature