From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 Dec 2017 19:32:09 +0000 (-0800)
Subject: Merge tag 'for-linus-4.15-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.15-rc4~28
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/bde6b37e49831d0a6452c39ce2b53662afec78af

Merge tag 'for-linus-4.15-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

Pull xen fixes from Juergen Gross:
 "Two minor fixes for running as Xen dom0:

   - when built as 32 bit kernel on large machines the Xen LAPIC
     emulation should report a rather modern LAPIC in order to support
     enough APIC-Ids

   - The Xen LAPIC emulation is needed for dom0 only, so build it only
     for kernels supporting to run as Xen dom0"

* tag 'for-linus-4.15-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen: XEN_ACPI_PROCESSOR is Dom0-only
  x86/Xen: don't report ancient LAPIC version
---

bde6b37e49831d0a6452c39ce2b53662afec78af