From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 15 Mar 2026 18:26:36 +0000 (-0700)
Subject: Merge tag 'x86-urgent-2026-03-15' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v7.0-rc4~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=13af67f599c9f177ac7ca4442be967a91c9ebae4;p=thirdparty%2Flinux.git

Merge tag 'x86-urgent-2026-03-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 fix from Ingo Molnar:
 "Work around S2RAM hang if the firmware unexpectedly re-enables the
  x2apic hardware while it was disabled by the kernel.

  Force-disable it again and issue a warning into the syslog"

* tag 'x86-urgent-2026-03-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/apic: Disable x2apic on resume if the kernel expects so
---

13af67f599c9f177ac7ca4442be967a91c9ebae4