From: Heiner Kallweit <hkallweit1@gmail.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Andi Shyti <andi.shyti@kernel.org>
Cc: Alex Deucher <alexander.deucher@amd.com>,
Kenneth Feng <kenneth.feng@amd.com>,
Likun Gao <Likun.Gao@amd.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: build failure after merge of the i2c-host tree
Date: Wed, 22 May 2024 07:33:03 +0200 [thread overview]
Message-ID: <c0cd58d3-f01a-4852-bf8b-fee4c865e4e2@gmail.com> (raw)
In-Reply-To: <20240522104128.37c646af@canb.auug.org.au>
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")
next prev parent reply other threads:[~2024-05-22 5:33 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-22 0:41 linux-next: build failure after merge of the i2c-host tree Stephen Rothwell
2024-05-22 5:33 ` Heiner Kallweit [this message]
2024-05-28 0:52 ` Stephen Rothwell
2024-05-28 1:01 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-07-04 2:02 Stephen Rothwell
2025-07-04 2:16 ` Qianfeng Rong
2025-07-04 2:36 ` Stephen Rothwell
2025-07-04 2:50 ` Qianfeng Rong
2025-05-06 9:11 Stephen Rothwell
2025-05-06 11:47 ` Andi Shyti
2024-03-11 23:41 Stephen Rothwell
2024-03-12 10:44 ` Andi Shyti
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c0cd58d3-f01a-4852-bf8b-fee4c865e4e2@gmail.com \
--to=hkallweit1@gmail.com \
--cc=Likun.Gao@amd.com \
--cc=alexander.deucher@amd.com \
--cc=andi.shyti@kernel.org \
--cc=kenneth.feng@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox