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

From: Stephen Rothwell <[email-masked]>
Date: Thu, 2 Sep 2021 07:50:38 +1000

Hi Masahiro,

On Fri, 20 Aug 2021 15:23:34 +0900 Masahiro Yamada <[email-masked]> wrote:
>
> On Fri, Aug 20, 2021 at 11:33 AM Stephen Rothwell <[email-masked]> wrote:
> >
> > Hi all,
> >
> > After merging the drm tree, today's linux-next build (x86_64 allmodconfig)
> > 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 with GuC")
> >
> > I have applied the following patch for today.  
> 
> 
> Thanks.
> 
> This fix-up does not depend on my kbuild tree in any way.
> 
> So, the drm maintainer can apply it to his tree.
> 
> Perhaps with
> 
> 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 <[email-masked]>
> > Date: Fri, 20 Aug 2021 12:24:19 +1000
> > Subject: [PATCH] drm/i915: use linux/stddef.h due to "isystem: trim/fixup stdarg.h and other headers"
> >
> > Signed-off-by: Stephen Rothwell <[email-masked]>
> > ---
> >  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

-- 
Cheers,
Stephen Rothwell