]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge tag 'x86-urgent-2026-03-15' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 15 Mar 2026 18:26:36 +0000 (11:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 15 Mar 2026 18:26:36 +0000 (11:26 -0700)
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


Trivial merge