Ingo Molnar 8c5db92a70 Merge branch 'linus' into locking/core, to resolve conflicts ...

Conflicts:
	include/linux/compiler-clang.h
	include/linux/compiler-gcc.h
	include/linux/compiler-intel.h
	include/uapi/linux/stddef.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2017-11-07 10:32:44 +01:00

..

cpuid.c

Merge branch 'kvm-ppc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

2017-09-08 14:40:43 +02:00

cpuid.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

debugfs.c

kvm: x86: export TSC information to user-space

2016-09-16 16:57:48 +02:00

emulate.c

x86/kvm: Move kvm_fastop_exception to .fixup section

2017-10-05 15:06:30 +02:00

hyperv.c

KVM: X86: implement the logic for spinlock optimization

2017-08-08 10:57:43 +02:00

hyperv.h

kvm: x86: hyperv: make VP_INDEX managed by userspace

2017-07-14 16:28:18 +02:00

i8254.c

KVM: x86: take slots_lock in kvm_free_pit

2017-07-12 22:38:26 +02:00

i8254.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

i8259.c

KVM: x86: simplify pic_ioport_read()

2017-04-12 20:17:15 +02:00

ioapic.c

KVM: x86: rename kvm_vcpu_request_scan_ioapic()

2017-04-12 20:17:14 +02:00

ioapic.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

irq_comm.c

KVM: x86: don't hold kvm->lock in KVM_SET_GSI_ROUTING

2017-05-02 14:45:45 +02:00

irq.c

KVM: x86: get rid of pic_irqchip()

2017-04-12 20:17:13 +02:00

irq.h

KVM: x86: don't hold kvm->lock in KVM_SET_GSI_ROUTING

2017-05-02 14:45:45 +02:00

Kconfig

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

kvm_cache_regs.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

lapic.c

KVM: x86: Update APICv on APIC reset

2017-11-02 18:28:13 +01:00

lapic.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

Makefile

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

mmu_audit.c

KVM: MMU: Add 5 level EPT & Shadow page table support.

2017-08-24 18:09:17 +02:00

mmu.c

locking/atomics: COCCINELLE/treewide: Convert trivial ACCESS_ONCE() patterns to READ_ONCE()/WRITE_ONCE()

2017-10-25 11:01:08 +02:00

mmu.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

mmutrace.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

mtrr.c

KVM: x86: generalize guest_cpuid_has_ helpers

2017-08-07 16:11:50 +02:00

page_track.c

locking/atomics: COCCINELLE/treewide: Convert trivial ACCESS_ONCE() patterns to READ_ONCE()/WRITE_ONCE()

2017-10-25 11:01:08 +02:00

paging_tmpl.h

KVM: MMU: always terminate page walks at level 1

2017-10-10 15:31:28 +02:00

pmu_amd.c

perf/x86/amd: Make HW_CACHE_REFERENCES and HW_CACHE_MISSES measure L2

2016-09-16 16:19:49 +02:00

pmu_intel.c

KVM: x86/vPMU: fix undefined shift in intel_pmu_refresh()

2017-05-19 19:59:27 +02:00

pmu.c

KVM: x86: never specify a sample period for virtualized in_tx_cp counters

2017-03-01 14:19:46 +01:00

pmu.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

svm.c

KVM: SVM: Add irqchip_split() checks before enabling AVIC

2017-09-14 17:05:13 +02:00

trace.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

tss.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

vmx.c

KVM: x86: Update APICv on APIC reset

2017-11-02 18:28:13 +01:00

x86.c

x86/fpu: Rename fpu__activate_curr() to fpu__initialize()

2017-09-26 09:43:44 +02:00

x86.h

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00