]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge tag 'v6.15-rc7' into x86/core, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Wed, 21 May 2025 06:42:51 +0000 (08:42 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 21 May 2025 06:45:03 +0000 (08:45 +0200)
Pick up build fixes from upstream to make this tree more testable.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
MAINTAINERS
arch/x86/coco/sev/core.c
arch/x86/events/intel/ds.c
arch/x86/include/asm/cpufeatures.h
arch/x86/kernel/alternative.c
arch/x86/kernel/cpu/amd.c
arch/x86/mm/init_32.c
drivers/platform/x86/amd/hsmp/acpi.c
drivers/platform/x86/amd/hsmp/plat.c
drivers/platform/x86/amd/pmc/pmc-quirks.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index c9a1b1ed42244537ed508c8b650263c878f799fe,81931e808bbc812fcde5cee5489d6c117dcc2859..62bf9547631ed133629a23a25287af45f8780f50
@@@ -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>