]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a57c5e6 9fccf06)
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)
commit29105f4def3b958d01164d56d7c18c269d2b5613
tree40bd72fe4e4d38a811312e5ae35bafd04c995d40tree | snapshot
parenta57c5e6a795a4fe8e5610e877ff0dc7e3a0f1e51commit | diff
parent9fccf06988ad3fc10a6e7bbc19c70fb461695008commit | diff
Merge tag 'kvm-arm-for-3.20' of git://git.kernel.org/pub/scm/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
Linux Kernel Source Tree.