On Thu, May 14, 2015 at 09:58:26AM +0800, Shannon Zhao wrote: > Hi Greg, > > Below are the git commit ids of KVM/ARM fixes that should be applied to > the 3.14-stable kernel tree from top to buttom order. > > 2d58b73 arm64: KVM: force cache clean on page fault when caches are off > 2072d29 arm64: KVM: allows discrimination of AArch32 sysreg access > 4d44923 arm64: KVM: trap VM system registers until MMU and caches are ON > a3c8bd3 ARM: KVM: introduce kvm_p*d_addr_end > 9d218a1 arm64: KVM: flush VM pages before letting the guest enable caches > 1597930 ARM: KVM: force cache clean on page fault when caches are off > 46c214d ARM: KVM: fix handling of trapped 64bit coprocessor accesses > 547f781 ARM: KVM: fix ordering of 64bit coprocessor accesses > ac30a11 ARM: KVM: introduce per-vcpu HYP Configuration Register > af20814 ARM: KVM: add world-switch for AMAIR{0,1} > 8034699 ARM: KVM: trap VM system registers until MMU and caches are ON > f2ae85b KVM: arm/arm64: vgic: fix GICD_ICFGR register accesses > 30c2117 KVM: ARM: vgic: Fix the overlap check action about setting the GICD & GICC base address. > ee9e101 arm64: kvm: use inner-shareable barriers for inner-shareable maintenance > 63afbe7 kvm: arm64: vgic: fix hyp panic with 64k pages on juno platform > 4f853a7 arm/arm64: KVM: Fix and refactor unmap_range I've stopped applying things at this point in time, as this commit, as you mention, doesn't apply cleanly. Can you provide a working backport of it? Or better yet, a backport of the ones that you know I will need? I'll go do the next 3.14-rc release with the above patches included, so if you could resend the list of what I haven't applied so far, that would be great. thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html