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 X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2B6AC433EF for ; Wed, 8 Sep 2021 09:07:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9952B61153 for ; Wed, 8 Sep 2021 09:07:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1348622AbhIHJIa (ORCPT ); Wed, 8 Sep 2021 05:08:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234820AbhIHJIW (ORCPT ); Wed, 8 Sep 2021 05:08:22 -0400 Received: from mail-oi1-x232.google.com (mail-oi1-x232.google.com [IPv6:2607:f8b0:4864:20::232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C1E4C061575 for ; Wed, 8 Sep 2021 02:07:15 -0700 (PDT) Received: by mail-oi1-x232.google.com with SMTP id c79so2228930oib.11 for ; Wed, 08 Sep 2021 02:07:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=PRwcd/2UOKTqhghCO0rYGQDQocd3n1lo0frI4efs54s=; b=Q55DSa5sCHU8EnDeHUgLydtlZ4Fbz4Nppjat38nh6VwQ8r1sOTEZBwkVNjDa+jUuPI fWyzNWTbjVL0sovYL5cni0bbvPZ6Ffk42Lj7DjfzKeKzzbf4jV1b0nNdU4aYOTNqcv6K EFEZeOcGQoi8o71BFSyoGzwCzT5Gny8lG6hEA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=PRwcd/2UOKTqhghCO0rYGQDQocd3n1lo0frI4efs54s=; b=AFzF2mjOxzUROyuArxXvkdXINHksZ+JmnkzAhHOT+ll3/9qSyS0e+yuOUbbaZ4HB/G taT4C0bR77DlYbF3+dtG4YQVtvYiOUcn/vXcgLGxX5H15+g2887DpwiVvexEJRqM4PwE FYL/prTOoaAmY+ttZdSwH68UeRMKjOcyKtC3UG8V0FUvUvC4lbhfxG4vU2Jz+8+szxUv O6Kl6HEFxIhZx4zuQ3s2JW7eLjKnqglUYwlT1S8eHQBFuXq7eeHjmH324ft4t4eN4VC3 CzyRDXtAMbqS4kbcRmv/mx8bIzYWzSRnPmBYtLhu3ABVGJNHC/UXhinXncAyCFtEjoqk ToNw== X-Gm-Message-State: AOAM533aFSE6wMDFsklp8M32YwRO4Zy4L4hyW5t4W0dg/Rc0Vyez9aQE Bvllv+L572g8Yy9fF/atSSWUZcIvXRN3llubmFrZGg== X-Google-Smtp-Source: ABdhPJxUOsi7Xekf2m6ONTAtRDQsLdU7reFN7AYckKBI+x/+5mAY35qtPw9WV3x4caxiCh9hmckLu0w7xJRvDUYFAQ0= X-Received: by 2002:a05:6808:2116:: with SMTP id r22mr1632623oiw.128.1631092034216; Wed, 08 Sep 2021 02:07:14 -0700 (PDT) MIME-Version: 1.0 References: <20210820123348.6535a87e@canb.auug.org.au> <20210902075038.7461d3c8@canb.auug.org.au> <20210906084947.4f65761d@canb.auug.org.au> In-Reply-To: From: Daniel Vetter Date: Wed, 8 Sep 2021 11:07:03 +0200 Message-ID: Subject: Re: linux-next: build failure after merge of the drm tree To: Masahiro Yamada Cc: Stephen Rothwell , intel-gfx , Joonas Lahtinen , "Nikula, Jani" , Rodrigo Vivi , Dave Airlie , DRI , John Harrison , Matthew Brost , Alexey Dobriyan , Linux Kernel Mailing List , Linux Next Mailing List Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Sep 8, 2021 at 5:14 AM Masahiro Yamada wrote: > > On Mon, Sep 6, 2021 at 4:34 PM Daniel Vetter wrote: > > > > On Mon, Sep 6, 2021 at 12:49 AM Stephen Rothwell wrote: > > > Hi all, > > > > > > On Thu, 2 Sep 2021 07:50:38 +1000 Stephen Rothwell wrote: > > > > > > > > On Fri, 20 Aug 2021 15:23:34 +0900 Masahiro Yamada wrote: > > > > > > > > > > On Fri, Aug 20, 2021 at 11:33 AM Stephen Rothwell wrote: > > > > > > > > > > > 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 > > > > > > | ^~~~~~~~~~ > > > > > > > > > > > > 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 > > > > > > 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 > > > > > > --- > > > > > > 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 > > > > > > +#include > > > > > > > > > > > > struct intel_engine_cs; > > > > > > struct intel_gt; > > > > > > -- > > > > > > 2.32.0 > > > > > > Ping? I am still applying this ... > > > > Apologies, this fell through a lot of cracks. I applied this to drm-next now. > > > > Rather, I was planning to apply this fix to my kbuild tree. > > Since you guys did not fix the issue in time, > I ended up with dropping [1] from my pull request. > > I want to get [1] merged in this MW. > > If I postponed it, somebody would add new > or inclusion in the next development > cycle, I will never make it in the mainline. > > [1] https://lore.kernel.org/linux-kernel/YQhY40teUJcTc5H4@localhost.localdomain/ Yeah no problem if you apply it too. For that: Acked-by: Daniel Vetter I just figured I make sure this is at least not lost. -Daniel > > > > > > > Matt/John, as author/committer it's your job to make sure issues and > > fixes for the stuff you're pushing don't get lost. I'd have expected > > John to apply this to at least drm-intel-gt-next (it's not even > > there). > > > > Joonas, I think this is the 2nd or 3rd or so issue this release cycle > > where some compile fix got stuck a bit because drm-intel-gt-next isn't > > in linux-next. Can we please fix that? It probably needs some changes > > to the dim script. > > > > Cheers, Daniel > > -- > > Daniel Vetter > > Software Engineer, Intel Corporation > > http://blog.ffwll.ch > > > > -- > Best Regards > Masahiro Yamada -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch