From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 9 Apr 2024 07:28:41 +0000 (+0200)
Subject: Merge tag 'v6.9-rc3' into x86/cpu, to pick up fixes
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0e6ebfd163645d300fdf4abedd1718195ad293bc;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'v6.9-rc3' into x86/cpu, to pick up fixes

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

0e6ebfd163645d300fdf4abedd1718195ad293bc
diff --cc arch/x86/kernel/setup.c
index d50b258a0290,e125e059e2c4..678369e46263
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@@ -7,10 -7,8 +7,9 @@@
   */
  #include <linux/acpi.h>
  #include <linux/console.h>
 +#include <linux/cpu.h>
  #include <linux/crash_dump.h>
  #include <linux/dma-map-ops.h>
- #include <linux/dmi.h>
  #include <linux/efi.h>
  #include <linux/ima.h>
  #include <linux/init_ohci1394_dma.h>