From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 21 May 2025 06:42:51 +0000 (+0200)
Subject: Merge tag 'v6.15-rc7' into x86/core, to pick up fixes
X-Git-Tag: v6.16-rc1~195^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=412751aa6991501d7defeadecfede59043d1b5e8;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'v6.15-rc7' into x86/core, to pick up fixes

Pick up build fixes from upstream to make this tree more testable.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

412751aa6991501d7defeadecfede59043d1b5e8
diff --cc drivers/platform/x86/amd/hsmp/plat.c
index c9a1b1ed42244,81931e808bbc8..62bf9547631ed
--- a/drivers/platform/x86/amd/hsmp/plat.c
+++ b/drivers/platform/x86/amd/hsmp/plat.c
@@@ -9,8 -9,9 +9,9 @@@
  
  #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
  
 -#include <asm/amd_hsmp.h>
 +#include <asm/amd/hsmp.h>
  
+ #include <linux/acpi.h>
  #include <linux/build_bug.h>
  #include <linux/device.h>
  #include <linux/module.h>