From: Linus Torvalds Date: Thu, 7 Sep 2017 16:25:15 +0000 (-0700) Subject: Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=57e88b43b81301d9b28f124a5576ac43a1cf9e8d;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'x86-platform-for-linus' of git://git./linux/kernel/git/tip/tip 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 --- 57e88b43b81301d9b28f124a5576ac43a1cf9e8d diff --cc MAINTAINERS index 11dde284a426,9fcffdfcb09d..fb63e53ea3c8 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -6310,8 -6257,8 +6310,9 @@@ M: Haiyang Zhang 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 f65a804b86f0,3e6f64073005..0038a2d10a7a --- a/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/