projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c6156df 4b99058)
Merge tag 'kvm-arm-for-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm...
authorPaolo Bonzini <pbonzini@redhat.com>
Fri, 23 Jan 2015 12:39:51 +0000 (13:39 +0100)
committerPaolo Bonzini <pbonzini@redhat.com>
Fri, 23 Jan 2015 12:39:51 +0000 (13:39 +0100)
commit1c6007d59a20762052cc92c0a2889ff11030d23a
tree40bd72fe4e4d38a811312e5ae35bafd04c995d40tree | snapshot
parentc6156df9d32141e5f1abb43078c56f2e5a0cb294commit | diff
parent4b990589952f0e30aa860184ac6c76219a74632ecommit | diff
Merge tag 'kvm-arm-for-3.20' of git://git./linux/kernel/git/kvmarm/kvmarm into kvm-next

KVM/ARM changes for v3.20 including GICv3 emulation, dirty page logging, added
trace symbols, and adding an explicit VGIC init device control IOCTL.

Conflicts:
arch/arm64/include/asm/kvm_arm.h
arch/arm64/kvm/handle_exit.c
arch/arm64/include/asm/esr.h diff1 | diff2 | blob | history
arch/arm64/include/asm/kvm_emulate.h diff1 | diff2 | blob | history
arch/arm64/kvm/handle_exit.c diff1 | diff2 | blob | history
arch/arm64/kvm/hyp.S diff1 | diff2 | blob | history
arch/arm64/kvm/sys_regs.c diff1 | diff2 | blob | history
arch/x86/include/asm/kvm_host.h diff1 | diff2 | blob | history
arch/x86/kvm/mmu.c diff1 | diff2 | blob | history
arch/x86/kvm/x86.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.