From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 1 Mar 2025 01:05:22 +0000 (-0800)
Subject: Merge tag 'x86-urgent-2025-02-28' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.14-rc5~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a5668899f54f6c9fe8619ecec23fb682d463f4a;p=thirdparty%2Flinux.git

Merge tag 'x86-urgent-2025-02-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fixes from Ingo Molnar:

 - Fix conflicts between devicetree and ACPI SMP discovery & setup

 - Fix a warm-boot lockup on AMD SC1100 SoC systems

 - Fix a W=1 build warning related to x86 IRQ trace event setup

 - Fix a kernel-doc warning

* tag 'x86-urgent-2025-02-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/entry: Fix kernel-doc warning
  x86/irq: Define trace events conditionally
  x86/CPU: Fix warm boot hang regression on AMD SC1100 SoC systems
  x86/of: Don't use DTB for SMP setup if ACPI is enabled
---

7a5668899f54f6c9fe8619ecec23fb682d463f4a