Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
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 --]

             reply	other threads:[~2024-10-01  3:44 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-01  3:44 Stephen Rothwell [this message]
2024-10-01  3:51 ` ✓ CI.Patch_applied: success for linux-next: build failure after merge of the random tree Patchwork
2024-10-01  3:51 ` ✗ CI.checkpatch: warning " Patchwork
2024-10-01  3:53 ` ✓ CI.KUnit: success " Patchwork
2024-10-01  4:04 ` ✓ CI.Build: " Patchwork
2024-10-01  4:07 ` ✓ CI.Hooks: " Patchwork
2024-10-01  4:08 ` ✓ CI.checksparse: " Patchwork
2024-10-01  4:32 ` ✗ CI.BAT: failure " Patchwork
2024-10-01  8:06 ` Uros Bizjak
2024-10-01 11:56 ` ✗ CI.FULL: failure for " Patchwork
2024-10-10  4:38 ` Stephen Rothwell
2024-11-20  2:34   ` Stephen Rothwell
2024-10-10  6:08 ` ✓ CI.Patch_applied: success for linux-next: build failure after merge of the random tree (rev2) Patchwork
2024-10-10  6:08 ` ✗ CI.checkpatch: warning " Patchwork
2024-10-10  6:10 ` ✓ CI.KUnit: success " Patchwork
2024-10-10  6:21 ` ✓ CI.Build: " Patchwork
2024-10-10  6:23 ` ✓ CI.Hooks: " Patchwork
2024-10-10  6:25 ` ✓ CI.checksparse: " Patchwork
2024-10-10  6:48 ` ✗ CI.BAT: failure " Patchwork
2024-10-10 20:20 ` ✗ CI.FULL: " Patchwork

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.auug.org.au \
    --cc=Jason@zx2c4.com \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=lucas.demarchi@intel.com \
    --cc=thomas.hellstrom@linux.intel.com \
    --cc=tytso@mit.edu \
    --cc=ubizjak@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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