Merge tag 'x86_platform_for_v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Apr 2021 16:34:19 +0000 (09:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 26 Apr 2021 16:34:19 +0000 (09:34 -0700)
commit64a925c9271ec50714b9cea6a9980421ca65f835
tree15d0f8d4ba996bb0acf5fa4d89a9e8a25752f676
parentca53fb2c7c7da99dc51e6c959c84c9b0aca4e040
parent27743f01e391ee1d80e3be2a09237507b965f91b
Merge tag 'x86_platform_for_v5.13' of git://git./linux/kernel/git/tip/tip

Pull x86 platform updates from Borislav Petkov:
 "A bunch of SGI UV improvements, fixes and cleanups"

* tag 'x86_platform_for_v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/platform/uv: Remove dead !CONFIG_KEXEC_CORE code
  x86/platform/uv: Fix !KEXEC build failure
  x86/platform/uv: Add more to secondary CPU kdump info
  x86/platform/uv: Use x2apic enabled bit as set by BIOS to indicate APIC mode
  x86/platform/uv: Set section block size for hubless architectures
  x86/platform/uv: Fix indentation warning in Documentation/ABI/testing/sysfs-firmware-sgi_uv
arch/x86/Kconfig
arch/x86/platform/uv/uv_nmi.c