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

Pull x86 platform updates from Ingo Molnar:
 "The main changes include various Hyper-V optimizations such as faster
  hypercalls and faster/better TLB flushes - and there's also some
  Intel-MID cleanups"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  tracing/hyper-v: Trace hyperv_mmu_flush_tlb_others()
  x86/hyper-v: Support extended CPU ranges for TLB flush hypercalls
  x86/platform/intel-mid: Make several arrays static, to make code smaller
  MAINTAINERS: Add missed file for Hyper-V
  x86/hyper-v: Use hypercall for remote TLB flush
  hyper-v: Globalize vp_index
  x86/hyper-v: Implement rep hypercalls
  hyper-v: Use fast hypercall for HVCALL_SIGNAL_EVENT
  x86/hyper-v: Introduce fast hypercall implementation
  x86/hyper-v: Make hv_do_hypercall() inline
  x86/hyper-v: Include hyperv/ only when CONFIG_HYPERV is set
  x86/platform/intel-mid: Make 'bt_sfi_data' const
  x86/platform/intel-mid: Make IRQ allocation a bit more flexible
  x86/platform/intel-mid: Group timers callbacks together

diff --cc MAINTAINERS
index 11dde284a426e626ac0e240696e2bfe82f6cc752,9fcffdfcb09d1a6056916576bd2b2d5a044ba6e0..fb63e53ea3c8af52bb8dc34aac67826143b987e3
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -6310,8 -6257,8 +6310,9 @@@ M:      Haiyang Zhang <haiyangz@microsoft.co
  M:    Stephen Hemminger <sthemmin@microsoft.com>
  L:    devel@linuxdriverproject.org
  S:    Maintained
 +F:    Documentation/networking/netvsc.txt
  F:    arch/x86/include/asm/mshyperv.h
+ F:    arch/x86/include/asm/trace/hyperv.h
  F:    arch/x86/include/uapi/asm/hyperv.h
  F:    arch/x86/kernel/cpu/mshyperv.c
  F:    arch/x86/hyperv
@@@ -6323,8 -6270,8 +6324,9 @@@ F:      drivers/net/hyperv
  F:    drivers/scsi/storvsc_drv.c
  F:    drivers/uio/uio_hv_generic.c
  F:    drivers/video/fbdev/hyperv_fb.c
 +F:    net/vmw_vsock/hyperv_transport.c
  F:    include/linux/hyperv.h
+ F:    include/uapi/linux/hyperv.h
  F:    tools/hv/
  F:    Documentation/ABI/stable/sysfs-bus-vmbus
  

diff --cc arch/x86/Kbuild
index f65a804b86f0535927f4c3fca23eb920755a6409,3e6f640730051ce5e88bc2450d77223736a4e8f5..0038a2d10a7a575f1aa24aa6485fd277503d1753
--- 1/arch/x86/Kbuild
--- 2/arch/x86/Kbuild
+++ b/arch/x86/Kbuild
@@@ -8,8 -8,11 +8,8 @@@ obj-$(CONFIG_KVM) += kvm
  obj-$(CONFIG_XEN) += xen/
  
  # Hyper-V paravirtualization support
- obj-$(CONFIG_HYPERVISOR_GUEST) += hyperv/
+ obj-$(subst m,y,$(CONFIG_HYPERV)) += hyperv/
  
 -# lguest paravirtualization support
 -obj-$(CONFIG_LGUEST_GUEST) += lguest/
 -
  obj-y += realmode/
  obj-y += kernel/
  obj-y += mm/

diff --cc arch/x86/include/asm/mshyperv.h
Simple merge

diff --cc arch/x86/kernel/cpu/mshyperv.c
Simple merge

diff --cc drivers/hv/channel_mgmt.c
Simple merge

diff --cc drivers/hv/vmbus_drv.c
Simple merge

diff --cc include/linux/hyperv.h
Simple merge