From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 25 Jun 2023 16:47:04 +0000 (-0700)
Subject: Merge tag 'x86_urgent_for_v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v6.6.17~4648
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=661e723b6fc7247e8aa6704651c49cd25c559f75;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'x86_urgent_for_v6.4' of git://git./linux/kernel/git/tip/tip

Pull x86 fixes from Borislav Petkov:

 - Do not use set_pgd() when updating the KASLR trampoline pgd entry
   because that updates the user PGD too on KPTI builds, resulting in
   memory corruption

 - Prevent a panic in the IO-APIC setup code due to conflicting command
   line parameters

* tag 'x86_urgent_for_v6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/apic: Fix kernel panic when booting with intremap=off and x2apic_phys
  x86/mm: Avoid using set_pgd() outside of real PGD pages
---

661e723b6fc7247e8aa6704651c49cd25c559f75