From: Avi Kivity <a...@redhat.com>

Conflicts:
        Documentation/feature-removal-schedule.txt
        arch/powerpc/include/asm/kvm_host.h
        arch/powerpc/include/asm/kvm_ppc.h
        arch/powerpc/kvm/book3s.c
        arch/powerpc/kvm/book3s_64_emulate.c
        arch/powerpc/kvm/book3s_64_rmhandlers.S
        arch/powerpc/kvm/emulate.c
        arch/powerpc/kvm/powerpc.c
        arch/x86/include/asm/kvm_host.h
        arch/x86/kvm/emulate.c
        arch/x86/kvm/i8259.c
        arch/x86/kvm/irq.h
        arch/x86/kvm/svm.c
        arch/x86/kvm/vmx.c
        arch/x86/kvm/x86.c
        include/linux/kvm.h
        virt/kvm/kvm_main.c

Signed-off-by: Avi Kivity <a...@redhat.com>
--
To unsubscribe from this list: send the line "unsubscribe kvm-commits" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to