From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Ingo Molnar <mingo@kernel•org>
Cc: "Ilpo Järvinen" <ilpo.jarvinen@linux•intel.com>,
"PDx86 ML" <platform-driver-x86@vger•kernel.org>,
"Suma Hegde" <suma.hegde@amd•com>,
"Hans de Goede" <hdegoede@redhat•com>,
"Mark Gross" <markgross@kernel•org>,
"Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>,
x86@kernel•org, "Thomas Gleixner" <tglx@linutronix•de>,
"Borislav Petkov" <bp@alien8•de>,
"Dave Hansen" <dave.hansen@linux•intel.com>
Subject: Re: linux-next: build failure after merge of the drivers-x86 tree
Date: Thu, 15 May 2025 22:19:29 +1000 [thread overview]
Message-ID: <20250515221929.3d646dab@canb.auug.org.au> (raw)
In-Reply-To: <aCWyatvDQEG5l6NV@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1105 bytes --]
Hi Ingo,
On Thu, 15 May 2025 11:22:50 +0200 Ingo Molnar <mingo@kernel•org> wrote:
>
> I'm not sure that's needed, the above build failure is not really a
> build failure caused by the platform-drivers-x86.git tree, it is a
> semantic merge conflict that should be resolved at the linux-next level
> I think. (And which conflict should be mentioned to Linus by whoever
> sends their tree second.)
>
> Stephen, could you apply the patch below perhaps?
Thanks for the fix. Applied from tomorrow.
> drivers/platform/x86/amd/hsmp/hwmon.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/platform/x86/amd/hsmp/hwmon.c b/drivers/platform/x86/amd/hsmp/hwmon.c
> index 7ffb61e0ef62..0cc9a742497f 100644
> --- a/drivers/platform/x86/amd/hsmp/hwmon.c
> +++ b/drivers/platform/x86/amd/hsmp/hwmon.c
> @@ -7,7 +7,7 @@
> * This file provides hwmon implementation for HSMP interface.
> */
>
> -#include <asm/amd_hsmp.h>
> +#include <asm/amd/hsmp.h>
>
> #include <linux/device.h>
> #include <linux/err.h>
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2025-05-15 12:19 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-15 6:46 linux-next: build failure after merge of the drivers-x86 tree Stephen Rothwell
2025-05-15 8:32 ` Ilpo Järvinen
2025-05-15 9:22 ` Ingo Molnar
2025-05-15 12:19 ` Stephen Rothwell [this message]
2025-05-15 12:57 ` Ingo Molnar
-- strict thread matches above, loose matches on Subject: below --
2026-01-15 3:52 Stephen Rothwell
2026-01-15 3:54 ` Kees Cook
2026-01-15 9:53 ` Ilpo Järvinen
2025-02-06 2:36 Stephen Rothwell
2025-02-06 10:27 ` Ilpo Järvinen
2025-02-06 14:49 ` Joshua Grisham
2025-02-06 19:22 ` Ilpo Järvinen
2021-08-20 5:00 Stephen Rothwell
2021-08-20 7:31 ` M D
2021-08-20 10:11 ` Hans de Goede
2021-07-28 16:48 Mark Brown
2021-07-28 17:01 ` Andy Shevchenko
2021-07-28 17:27 ` Kammela, Gayatri
2021-07-28 17:55 ` Hans de Goede
2021-07-28 17:59 ` Kammela, Gayatri
2019-10-15 2:00 Stephen Rothwell
2019-10-15 8:04 ` Andy Shevchenko
2019-10-15 11:42 ` Stephen Rothwell
2018-06-12 1:23 Stephen Rothwell
2018-06-12 3:28 ` dvhart
2018-06-12 5:18 ` Darren Hart
2015-06-05 10:13 Michael Ellerman
2015-06-08 4:52 ` Darren Hart
2015-06-04 8:13 Stephen Rothwell
2015-06-04 17:51 ` Radim Krčmář
2015-06-08 4:27 ` Darren Hart
2012-08-20 6:11 Stephen Rothwell
2012-08-20 6:44 ` AceLan Kao
2012-03-22 4:33 Stephen Rothwell
2012-03-21 5:52 Stephen Rothwell
2012-03-21 11:19 ` Matthew Garrett
2011-02-22 5:22 Stephen Rothwell
2011-02-22 6:26 ` Mattia Dongili
2011-02-22 11:46 ` Mattia Dongili
2011-02-22 14:34 ` Matthew Garrett
2011-02-22 22:22 ` Stephen Rothwell
2011-02-14 5:39 Stephen Rothwell
2011-02-14 22:42 ` Rafael J. Wysocki
2011-03-25 4:44 ` Stephen Rothwell
2011-02-08 3:45 Stephen Rothwell
2011-02-08 3:50 ` Matthew Garrett
2010-12-07 2:24 Stephen Rothwell
2010-10-05 4:11 Stephen Rothwell
2010-10-05 10:36 ` Ike Panhc
2010-10-06 10:45 ` Ike Panhc
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=20250515221929.3d646dab@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bp@alien8$(echo .)de \
--cc=dave.hansen@linux$(echo .)intel.com \
--cc=hdegoede@redhat$(echo .)com \
--cc=ilpo.jarvinen@linux$(echo .)intel.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=markgross@kernel$(echo .)org \
--cc=mingo@kernel$(echo .)org \
--cc=platform-driver-x86@vger$(echo .)kernel.org \
--cc=suma.hegde@amd$(echo .)com \
--cc=tglx@linutronix$(echo .)de \
--cc=x86@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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