From patchwork Mon Oct 31 00:13:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13075 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2025228wru; Sun, 30 Oct 2022 17:16:53 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7vk3tePXlzEf0T3nbEMQYGGJfvdRagRGH6H28mJdRgjAdp8WSqbVFwTM+3CHHoR5a/ziqR X-Received: by 2002:a05:6402:3890:b0:45c:2b5:b622 with SMTP id fd16-20020a056402389000b0045c02b5b622mr11384900edb.69.1667175412873; Sun, 30 Oct 2022 17:16:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667175412; cv=none; d=google.com; s=arc-20160816; b=ok1OzvPOJKQAlF8/ch1JRCjSpwOjXIbY42aILPknvFKNv7UNReL2mReTW7r2FQlr4i bP5oLCgQRr8wd2HwOWhnuZKfDlcrRTK0FUostrugVLa/5772AEs9uS6+YD7N672Ezciv HFad108+F7LnRYpKyuz5aTTdK+mutPCufyFYyzmTEEjcp1cwg9kFiWpaPQJIHVUgTsw9 Sl4MDtxzkNwHbzrevwI+XoMerOfVJb182SGfKnyXFKnkTEiYmH18MpXZv5i1Ojh1bHgL THMPSTixGO2skyiBBFKSqSpb58MqWJhI1mXAUncSR1F2oIf66nhT2qSgnH90JqRbtlel aeHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=xegPlFecIBiquH+rR1wquFUQHWsEBb6GVrP8Aob7dS4=; b=f2KPo6De2jCGyuVUChjBEOrvVtzrR/zxggpRjCVO77NZj1dYmSLAjG7mv+dZu3t9FE MC6X2bCVCqeyCZY7wkYEdWOWTGfaoIOZFj+p2Tyf9c1ElLm4pR2rOtjZFEFHa52cy3zk dTrWYXYkse0x8df8/qWPs3jEUkzWqmnIUiOmiK6FI85Pd5ZdyNgx8EnwMdM/SFYU0gy5 NZ8kq9wgNGOZBVvt9G23BmRvjGUAOg9YelkKhdCU9kLBjt4EVKdYLn7L0cln5n55gznl aFgvKrdjbj0s8/2zSkefyuYeZVKtuBrqHV4TaslLj3TkOSnuWdjKqisFaWF/J0JymTmv MsnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=DfpKFFfY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l25-20020aa7d959000000b004616aff8436si5345914eds.83.2022.10.30.17.16.25; Sun, 30 Oct 2022 17:16:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=DfpKFFfY; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229528AbiJaAN0 (ORCPT + 99 others); Sun, 30 Oct 2022 20:13:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229441AbiJaANZ (ORCPT ); Sun, 30 Oct 2022 20:13:25 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89891C1; Sun, 30 Oct 2022 17:13:23 -0700 (PDT) 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 ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4N0tsT4gYSz4x1H; Mon, 31 Oct 2022 11:13:17 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1667175198; bh=xegPlFecIBiquH+rR1wquFUQHWsEBb6GVrP8Aob7dS4=; h=Date:From:To:Cc:Subject:From; b=DfpKFFfYKIPitKTTI+yIeNwQiKkOKXKhdQJiaWiGEGfAuCC0uzv6QIMtXAJS7GFEz y3f4uiGIovcTPtDk7sm7c+wh+Zh+z6ydgyP/ypYLW6hMEsQswj6DtlS6mbh9tjU4hf GX/sZyM3QPHSAWnFVlhA9zkHvypwbCOCuLQ4BZL1+IL5aLfOpv0jRmExQwMtiND76p JxtUsfxr0qFjIzLOXN4GM7Z9NlRGR1ASfjEzlvcdFnfpURmgA+PdqJaAy851iL6dMk wMMGD2g3WCAFYp0qPQXWZNnQTyIby3105AvRf0AvgXjjvZHPImFwDX6ngzDvxVNcK7 k7KQlcTfj03vA== Date: Mon, 31 Oct 2022 11:13:15 +1100 From: Stephen Rothwell To: Alex Deucher Cc: Linux Kernel Mailing List , Linux Next Mailing List , Dave Airlie Subject: linux-next: build failure after merge of the amdgpu tree Message-ID: <20221031111315.04b0f8fa@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748160125775830293?= X-GMAIL-MSGID: =?utf-8?q?1748160125775830293?= Hi all, After merging the amdgpu tree, today's linux-next build (x86_64 allmodconfig) failed like this: drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c: In function 'amdgpu_firmware_info': drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c:353:9: error: duplicate case value 353 | case AMDGPU_INFO_FW_IMU: | ^~~~ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c:349:9: note: previously used here 349 | case AMDGPU_INFO_FW_IMU: | ^~~~ Caused by commit 22834837f8dd ("Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux") because commits b72362962a66 ("drm/amd: Add IMU fw version to fw version queries") from the amdgpu tree and 68bc147363bd ("drm/amd: Add IMU fw version to fw version queries") from Linus' tree are the same patch and git merged this hunk from both :-( I have applied the following merge fixup patch. From: Stephen Rothwell Date: Mon, 31 Oct 2022 11:05:29 +1100 Subject: [PATCH] fixup for bad merge of "drm/amd: Add IMU fw version to fw version queries" Signed-off-by: Stephen Rothwell --- drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c index 662704371756..4e42dcb1950f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c @@ -350,10 +350,6 @@ static int amdgpu_firmware_info(struct drm_amdgpu_info_firmware *fw_info, fw_info->ver = adev->gfx.imu_fw_version; fw_info->feature = 0; break; - case AMDGPU_INFO_FW_IMU: - fw_info->ver = adev->gfx.imu_fw_version; - fw_info->feature = 0; - break; default: return -EINVAL; }