Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Thu, 2 Sep 2021 07:50:38 +1000
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Masahiro Yamada <masahiroy@kernel.org>
Cc:     Dave Airlie <airlied@linux.ie>,
        DRI <dri-devel@lists.freedesktop.org>,
        John Harrison <John.C.Harrison@intel.com>,
        Matthew Brost <matthew.brost@intel.com>,
        Alexey Dobriyan <adobriyan@gmail.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the drm tree
Message-ID: <20210902075038.7461d3c8@canb.auug.org.au>
In-Reply-To: <CAK7LNASv-F1Y7kpaDF+_=TW0Jzvpo1uuNL1B5jUmCCRqv-45bA@mail.gmail.com>
References: <20210820123348.6535a87e@canb.auug.org.au>
        <CAK7LNASv-F1Y7kpaDF+_=TW0Jzvpo1uuNL1B5jUmCCRqv-45bA@mail.gmail.com>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/P6VydhTMW+uTGLu/gN5IeDS";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/P6VydhTMW+uTGLu/gN5IeDS
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi Masahiro,

On Fri, 20 Aug 2021 15:23:34 +0900 Masahiro Yamada <masahiroy@kernel.org> w=
rote:
>
> On Fri, Aug 20, 2021 at 11:33 AM Stephen Rothwell <sfr@canb.auug.org.au> =
wrote:
> >
> > Hi all,
> >
> > After merging the drm tree, today's linux-next build (x86_64 allmodconf=
ig)
> > failed like this:
> >
> > In file included from drivers/gpu/drm/i915/i915_debugfs.c:39:
> > drivers/gpu/drm/i915/gt/intel_gt_requests.h:9:10: fatal error: stddef.h=
: No such file or directory
> >     9 | #include <stddef.h>
> >       |          ^~~~~~~~~~
> >
> > Caused by commit
> >
> >   564f963eabd1 ("isystem: delete global -isystem compile option")
> >
> > from the kbuild tree interacting with commit
> >
> >   b97060a99b01 ("drm/i915/guc: Update intel_gt_wait_for_idle to work wi=
th GuC")
> >
> > I have applied the following patch for today. =20
>=20
>=20
> Thanks.
>=20
> This fix-up does not depend on my kbuild tree in any way.
>=20
> So, the drm maintainer can apply it to his tree.
>=20
> Perhaps with
>=20
> Fixes: b97060a99b01 ("drm/i915/guc: Update intel_gt_wait_for_idle to
> work with GuC")

OK, so that didn't happen so I will now apply the merge fix up to the
merge of the kbuild tree.

> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Fri, 20 Aug 2021 12:24:19 +1000
> > Subject: [PATCH] drm/i915: use linux/stddef.h due to "isystem: trim/fix=
up stdarg.h and other headers"
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> >  drivers/gpu/drm/i915/gt/intel_gt_requests.h | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/gt/intel_gt_requests.h b/drivers/gpu/=
drm/i915/gt/intel_gt_requests.h
> > index 51dbe0e3294e..d2969f68dd64 100644
> > --- a/drivers/gpu/drm/i915/gt/intel_gt_requests.h
> > +++ b/drivers/gpu/drm/i915/gt/intel_gt_requests.h
> > @@ -6,7 +6,7 @@
> >  #ifndef INTEL_GT_REQUESTS_H
> >  #define INTEL_GT_REQUESTS_H
> >
> > -#include <stddef.h>
> > +#include <linux/stddef.h>
> >
> >  struct intel_engine_cs;
> >  struct intel_gt;
> > --
> > 2.32.0

--=20
Cheers,
Stephen Rothwell

--Sig_/P6VydhTMW+uTGLu/gN5IeDS
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmEv9a4ACgkQAVBC80lX
0Gyfhgf/cOlOxQo7LdY6lacikjcXfwu1wdLPW7Z3AjOGWTohweO9GYJFgtOkKyEo
7/pjpAPYTYNU/47awEy4DBjE8LS6z6A4gkakVkcd4E1GchD/HnVHyxOyZICwTwPX
Oe3fvd7ZbjIxJ3FCUlFPySi4VydWeL2BBdAdjCEFYkcVuy33sEvx9xEQLr6X+99u
JFZi6nIvbFTb5EjnAraJ5M1wwHDU+03Gzef2iLJTWWbWdYeYg2QuPbgafy9MWu+6
ZrCim6nvKB/2oZ3I7YJZDCkAhmGqS1kPnrSZwjznIMoY3aJbOOOrCugfa2cOrhSR
DmQZ1rwMa0TKMZcj8SypG166QiBV/w==
=QCKm
-----END PGP SIGNATURE-----

--Sig_/P6VydhTMW+uTGLu/gN5IeDS--