linux-kernel - Re: linux-next: build failure after merge of the drivers-x86 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]

Message-ID: <20250515221929.3d646dab@canb.auug.org.au>
Date: Thu, 15 May 2025 22:19:29 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Ingo Molnar <mingo@...nel.org>
Cc: Ilpo Järvinen <ilpo.jarvinen@...ux.intel.com>, PDx86 ML
 <platform-driver-x86@...r.kernel.org>, Suma Hegde <suma.hegde@....com>,
 Hans de Goede <hdegoede@...hat.com>, Mark Gross <markgross@...nel.org>,
 Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, x86@...nel.org, Thomas Gleixner
 <tglx@...utronix.de>, Borislav Petkov <bp@...en8.de>, Dave Hansen
 <dave.hansen@...ux.intel.com>
Subject: Re: linux-next: build failure after merge of the drivers-x86 tree

Hi Ingo,

On Thu, 15 May 2025 11:22:50 +0200 Ingo Molnar <mingo@...nel.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

Content of type "application/pgp-signature" skipped