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=-6.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 33A1FC432C3 for ; Thu, 21 Nov 2019 18:37:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0D4FB20672 for ; Thu, 21 Nov 2019 18:37:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="TqCL0T6N" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726880AbfKUShX (ORCPT ); Thu, 21 Nov 2019 13:37:23 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:38362 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727092AbfKUShW (ORCPT ); Thu, 21 Nov 2019 13:37:22 -0500 Received: by mail-wr1-f67.google.com with SMTP id i12so5699786wro.5; Thu, 21 Nov 2019 10:37:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=DP2863yACbff5i+RB3eZcwhNt5zRZsKWECbY34JBcgA=; b=TqCL0T6NAWRZxDvpie2AstfsSje6ENUuHqVWYhyMpDwMihvL3IVbv4lfh7bRYOxeDC OAm9kjeRqp63n1gZP92JqXyABQxJk8jE6A53cdPJQrQkGj33N9Ero1yWvfbsVVKFNa8/ YPYJQDJuUetzBzUj/8coik4Q2EvmX5srQLQ+1B0pTx5XmNqsfKW8hPG9ErbIBTwhBj+F xUHwgCmXC8zwX+oKI5OGaLs4sumgIvpTk1LNPiHa7slWqezoG6W0nFdpwkkepiyeWUs/ ob5zd1b/O3gBtP8EUCPpmOaj+AFABXFnyEyDUpJX7Lu6aADQ/QfrLWZzDLiw7isPBCdJ mMqw== 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=DP2863yACbff5i+RB3eZcwhNt5zRZsKWECbY34JBcgA=; b=Sz2LF6p9a98PubE2ZzuJa9IKshhwsEuXjRSnsfrMGBBo0q4a9tDAxQJQV/3MX/jEyh BfNwbwI1SgS9gdbiepbslBmK+4T81vAXhSTTdUpK5eKGGfCFeCbonvkAYp/jLYWFBdIN EccH7NmuH6dvHJK2tNjihiEQRnGLioNv1dgJloJmtQeWsdoGR9gPAEHme1OqwpCYTncK QrfZGlF1iu9yVDiEE+PK5pgEH8C6K9HyLg8IPJr9YL2w2i8/Ltmeb/wx+ZMF4YtAzBXh l8To7lcaBP3s+3JJNZj61ZGTqwsBdxIwLRXmil8f3/CbOgLWaO60m0eAyWZ3IqLepDXW oAyw== X-Gm-Message-State: APjAAAWRJUUy0znfquLX/qSg4Wj/GZq2yeyx0uJmH7At/xLkyqilyP6M OnXgyaEu2OyDDXbXQuQfe/aZ8aXQiQmH758Ejac= X-Google-Smtp-Source: APXvYqw0gk8+IPXr82CnrP23ZVlU698/XaqMec5S9dwPM2xvZo/BgowQ0jIeqLBr0yaDtAygzcPKTGG5mcm9rFvHOmU= X-Received: by 2002:a5d:4688:: with SMTP id u8mr12610035wrq.40.1574361441116; Thu, 21 Nov 2019 10:37:21 -0800 (PST) MIME-Version: 1.0 References: <20191121145403.46789cb5@canb.auug.org.au> In-Reply-To: <20191121145403.46789cb5@canb.auug.org.au> From: Alex Deucher Date: Thu, 21 Nov 2019 13:37:09 -0500 Message-ID: Subject: Re: linux-next: build failure after merge of the tip tree To: Stephen Rothwell Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Dave Airlie , DRI , Alex Deucher , Linux Next Mailing List , Linux Kernel Mailing List , Kevin Wang Content-Type: text/plain; charset="UTF-8" Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Wed, Nov 20, 2019 at 10:54 PM Stephen Rothwell wrote: > > Hi all, > > After merging the tip tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > In file included from include/trace/define_trace.h:102, > from drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h:502, > from drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c:29: > include/trace/../../drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h:476:52: error: expected expression before ';' token > 476 | __string(ring, sched_job->base.sched->name); > | ^ > include/trace/trace_events.h:435:2: note: in definition of macro 'DECLARE_EVENT_CLASS' > 435 | tstruct \ > | ^~~~~~~ > include/trace/trace_events.h:77:9: note: in expansion of macro 'PARAMS' > 77 | PARAMS(tstruct), \ > | ^~~~~~ > include/trace/../../drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h:472:1: note: in expansion of macro 'TRACE_EVENT' > 472 | TRACE_EVENT(amdgpu_ib_pipe_sync, > | ^~~~~~~~~~~ > include/trace/../../drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h:475:6: note: in expansion of macro 'TP_STRUCT__entry' > 475 | TP_STRUCT__entry( > | ^~~~~~~~~~~~~~~~ > > Caused by commit > > 2c2fdb8bca29 ("drm/amdgpu: fix amdgpu trace event print string format error") > > from the drm tree interacting with commit > > 60fdad00827c ("ftrace: Rework event_create_dir()") > > from the tip tree. > > I have added the following merge fix patch: Applied. Thanks! Alex > > From: Stephen Rothwell > Date: Thu, 21 Nov 2019 14:46:00 +1100 > Subject: [PATCH] merge fix for "ftrace: Rework event_create_dir()" > > Signed-off-by: Stephen Rothwell > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h > index f940526c5889..63e734a125fb 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h > @@ -473,7 +473,7 @@ TRACE_EVENT(amdgpu_ib_pipe_sync, > TP_PROTO(struct amdgpu_job *sched_job, struct dma_fence *fence), > TP_ARGS(sched_job, fence), > TP_STRUCT__entry( > - __string(ring, sched_job->base.sched->name); > + __string(ring, sched_job->base.sched->name) > __field(uint64_t, id) > __field(struct dma_fence *, fence) > __field(uint64_t, ctx) > -- > 2.23.0 > > -- > Cheers, > Stephen Rothwell > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/dri-devel