From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3E949D6207F for ; Wed, 20 Nov 2024 02:35:01 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A124210E11B; Wed, 20 Nov 2024 02:35:00 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; secure) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="oJ2Ttww2"; dkim-atps=neutral Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by gabe.freedesktop.org (Postfix) with ESMTPS id A649E10E11B; Wed, 20 Nov 2024 02:34:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1732070090; bh=v7E20c1qfPaOhIqvypHRa4hnsb9Acllf9o72WjX/5mE=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=oJ2Ttww2ydfUfWH1yak1BsWsPHq2+mjKFAqk8jYxqkZuTPq2maxcCA3T9EVwMrur4 yC1g2BoDh+PjEDfeWLiaxOVW86/AFV8x0WBu3RsBsqASAiQ2JTwegEzoadeeQ9qiaL F/873t1iSdbp9O8Vqp9844Y6BhoUsP7TKh4+5QvywHxhDpCfqaUY4pBtmkMyg5/3N4 NNc3A9q2cy3pVv9nLhZkztam3ziN1o+RZmkQo4Scn1cQkAaNq5kJd6MiSk7rHrFgYS Ih0DgesDD2y697wFEeT6xyMqWE208aTAglJReR4M+yew1MwJ/oKkHih1GxQAviYYIy XydIkqBFy4o+A== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4XtQS86pHKz4xcw; Wed, 20 Nov 2024 13:34:48 +1100 (AEDT) Date: Wed, 20 Nov 2024 13:34:51 +1100 From: Stephen Rothwell To: Dave Airlie Cc: Theodore Ts'o , "Jason A. Donenfeld" , Lucas De Marchi , Thomas =?UTF-8?B?SGVsbHN0csO2?= =?UTF-8?B?bQ==?= , Uros Bizjak , DRM XE List , Linux Kernel Mailing List , Linux Next Mailing List , DRI Subject: Re: linux-next: build failure after merge of the random tree Message-ID: <20241120133451.69ece175@canb.auug.org.au> In-Reply-To: <20241010153855.588ec772@canb.auug.org.au> References: <20241001134423.62b12a80@canb.auug.org.au> <20241010153855.588ec772@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/hhMAZBGHzC+bfx+5XMczUGl"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" --Sig_/hhMAZBGHzC+bfx+5XMczUGl Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, On Thu, 10 Oct 2024 15:38:55 +1100 Stephen Rothwell = wrote: > > On Tue, 1 Oct 2024 13:44:23 +1000 Stephen Rothwell = wrote: > > > > After merging the random tree, today's linux-next build (x86_64 > > allmodconfig) failed like this: > >=20 > >=20 > > Caused by commit > >=20 > > 38d1a9d296c8 ("random: Do not include in ") > >=20 > > interacting with commit > >=20 > > 5a90b60db5e6 ("drm/xe: Add a xe_bo subtest for shrinking / swapping") > >=20 > > from the drm-xe tree. > >=20 > > I have applied the following merge fix patch for today. =20 >=20 > The patch is now: >=20 > From: Stephen Rothwell > Date: Tue, 1 Oct 2024 13:33:48 +1000 > Subject: [PATCH] fix up for "random: Do not include in > " >=20 > interacting with commit >=20 > 5a90b60db5e6 ("drm/xe: Add a xe_bo subtest for shrinking / swapping") >=20 > from the drm-xe tree. >=20 > Signed-off-by: Stephen Rothwell > --- > drivers/gpu/drm/xe/tests/xe_bo.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) >=20 > 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 @@ > =20 > #include > #include > -#include > +#include > #include > =20 > #include This patch is now needed when merging the drm tree and Linus' tree. --=20 Cheers, Stephen Rothwell --Sig_/hhMAZBGHzC+bfx+5XMczUGl Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmc9SssACgkQAVBC80lX 0Gy2gQgApGEZEiS1QAqXHVlh4J2wwbYkrOffJcGDd0GWplCxiXLIxU5nBBpD588f lNKweHWPhE+bzQUnujn8rzYkbWuQsLufoFEDxLtRgkNcJYShUllPNpjlVzj56u9W YoTXJusR7CMdThLOPNJlKNE24EYhKoJU618qu3cVlM47EzolYUsH+ZVOaKWrN6J1 2H5+Qrlw8gGdPq9Wwuwq6Of91rbS40PR+VrtugQu5o44j7i7hDbuhVZbnH5NQS/+ x51MkcldS5MYd+3eKwMPDPQutR3iienGbxCoTVDOgOwMthNNN2Jknov8yjhOCoUi N2fjEtiOqqXOONiVDUpPw6JPC5hivg== =WIyO -----END PGP SIGNATURE----- --Sig_/hhMAZBGHzC+bfx+5XMczUGl--