From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Theodore Ts'o" <tytso@mit•edu>,
"Jason A. Donenfeld" <Jason@zx2c4•com>,
"Lucas De Marchi" <lucas.demarchi@intel•com>,
"Thomas Hellström" <thomas.hellstrom@linux•intel.com>
Cc: Uros Bizjak <ubizjak@gmail•com>,
DRM XE List <intel-xe@lists•freedesktop.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: build failure after merge of the random tree
Date: Tue, 1 Oct 2024 13:44:23 +1000 [thread overview]
Message-ID: <20241001134423.62b12a80@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1314 bytes --]
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@canb•auug.org.au>
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@canb•auug.org.au>
---
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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-10-01 3:44 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-01 3:44 Stephen Rothwell [this message]
2024-10-01 8:06 ` linux-next: build failure after merge of the random tree Uros Bizjak
2024-10-10 4:38 ` Stephen Rothwell
2024-11-20 2:34 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2026-01-23 21:48 Mark Brown
2026-01-23 21:56 ` Andy Shevchenko
2026-01-23 22:10 ` Mark Brown
2026-01-23 22:18 ` Andy Shevchenko
2026-01-23 22:22 ` Mark Brown
2026-01-23 22:44 ` Andy Shevchenko
2026-02-02 15:22 ` Mark Brown
2026-02-02 17:34 ` Andy Shevchenko
2026-02-02 19:51 ` Jason A. Donenfeld
2024-09-05 10:19 Stephen Rothwell
2024-09-05 12:47 ` Jason A. Donenfeld
2024-03-25 1:01 Stephen Rothwell
2024-03-26 16:08 ` Jason A. Donenfeld
2022-12-14 1:53 Stephen Rothwell
2022-12-14 5:37 ` Jason A. Donenfeld
2022-12-13 3:36 Stephen Rothwell
2022-12-13 4:02 ` Jason A. Donenfeld
2022-10-31 6:09 Stephen Rothwell
2022-10-31 10:31 ` Jason A. Donenfeld
2022-10-24 2:23 Stephen Rothwell
2022-10-24 4:28 ` Jason A. Donenfeld
2022-10-24 6:33 ` Stephen Rothwell
2022-03-03 8:04 Stephen Rothwell
2022-03-03 10:41 ` Jason A. Donenfeld
2018-06-29 6:06 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241001134423.62b12a80@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Jason@zx2c4$(echo .)com \
--cc=intel-xe@lists$(echo .)freedesktop.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lucas.demarchi@intel$(echo .)com \
--cc=thomas.hellstrom@linux$(echo .)intel.com \
--cc=tytso@mit$(echo .)edu \
--cc=ubizjak@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox