Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

Pull x86 platform updayes from Ingo Molnar:
 "Most of the commits add ACRN hypervisor guest support, plus two
  cleanups"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/jailhouse: Mark jailhouse_x2apic_available() as __init
  x86/platform/geode: Drop <linux/gpio.h> includes
  x86/acrn: Use HYPERVISOR_CALLBACK_VECTOR for ACRN guest upcall vector
  x86: Add support for Linux guests on an ACRN hypervisor
  x86/Kconfig: Add new X86_HV_CALLBACK_VECTOR config symbol

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/entry/entry_64.S
Simple merge

diff --cc arch/x86/kernel/cpu/Makefile
Simple merge

diff --cc arch/x86/kernel/irq.c
Simple merge

diff --cc arch/x86/kernel/jailhouse.c
Simple merge

diff --cc arch/x86/platform/geode/alix.c
Simple merge

diff --cc arch/x86/platform/geode/geos.c
Simple merge

diff --cc arch/x86/platform/geode/net5501.c
Simple merge

diff --cc drivers/hv/Kconfig
Simple merge