linux-kernel - linux-next: build failure after merge of the amdgpu tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:   Mon, 31 Oct 2022 11:13:15 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Alex Deucher <alexdeucher@...il.com>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Dave Airlie <airlied@...hat.com>
Subject: linux-next: build failure after merge of the amdgpu tree

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 <sfr@...b.auug.org.au>
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 <sfr@...b.auug.org.au>
---
 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;
 	}
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped