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; } -- 2.35.1 -- Cheers, Stephen Rothwell