• Paolo Bonzini's avatar
    Merge tag 'kvm-arm-for-3.18' of... · e77d99d4
    Paolo Bonzini authored
    Merge tag 'kvm-arm-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-next
    
    Changes for KVM for arm/arm64 for 3.18
    
    This includes a bunch of changes:
     - Support read-only memory slots on arm/arm64
     - Various changes to fix Sparse warnings
     - Correctly detect write vs. read Stage-2 faults
     - Various VGIC cleanups and fixes
     - Dynamic VGIC data strcuture sizing
     - Fix SGI set_clear_pend offset bug
     - Fix VTTBR_BADDR Mask
     - Correctly report the FSC on Stage-2 faults
    
    Conflicts:
    	virt/kvm/eventfd.c
    	[duplicate, different patch where the kvm-arm version broke x86.
    	 The kvm tree instead has the right one]
    e77d99d4
kvm_main.c 75.5 KB