On Tue, Mar 01, 2016 at 01:12:44PM +0000, Marc Zyngier wrote: > In order to reduce the risk of a bad merge, let's move the new > kvm_call_hyp back to its original location in the file. This has > zero impact from a code point of view. > > Signed-off-by: Marc Zyngier <marc.zyngier@xxxxxxx> > --- > Catalin, > > Would you mind merging this on top of arm64/for-next/core? I just > verified that this prevents yet another mismerge between the arm64 and > KVM trees. Applied. Thanks. -- Catalin _______________________________________________ kvmarm mailing list kvmarm@xxxxxxxxxxxxxxxxxxxxx https://lists.cs.columbia.edu/mailman/listinfo/kvmarm