linux-kernel - Re: linux-next: build failure after merge of the i2c-host 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>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date: Wed, 22 May 2024 07:33:03 +0200
From: Heiner Kallweit <hkallweit1@...il.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>,
 Andi Shyti <andi.shyti@...nel.org>
Cc: Alex Deucher <alexander.deucher@....com>,
 Kenneth Feng <kenneth.feng@....com>, Likun Gao <Likun.Gao@....com>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
 Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: build failure after merge of the i2c-host tree

On 22.05.2024 02:41, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the i2c-host tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu14/smu_v14_0_2_ppt.c: In function 'smu_v14_0_2_i2c_control_init':
> drivers/gpu/drm/amd/amdgpu/../pm/swsmu/smu14/smu_v14_0_2_ppt.c:1565:34: error: 'I2C_CLASS_SPD' undeclared (first use in this function); did you mean 'I2C_CLASS_HWMON'?
>  1565 |                 control->class = I2C_CLASS_SPD;
>       |                                  ^~~~~~~~~~~~~
>       |                                  I2C_CLASS_HWMON
> 
> Caused by commit
> 
>   49b33f4b3a9e ("i2c: Remove I2C_CLASS_SPD")
> 
> interacting with commit
> 
>   3e55845c3983 ("drm/amd/swsmu: add smu v14_0_2 support")
> 
> from Linus' tree (in the current merge window).
> 
> I have used the i2c-host tree from next-20240521 for today.
> 
This conflict has been resolved by:
e22e0e483b2c ("drm/amd/pm: remove deprecated I2C_CLASS_SPD support from newly added SMU_14_0_2")