[GIT PULL 03/36] arm/arm64: KVM: add tracing support for arm64 exit handler
mark.rutland at arm.com
Fri Jan 23 05:41:57 PST 2015
On Fri, Jan 23, 2015 at 12:49:41PM +0000, Paolo Bonzini wrote:
> On 23/01/2015 13:01, Paolo Bonzini wrote:
> > On 23/01/2015 12:35, Mark Rutland wrote:
> >> https://lkml.org/lkml/2015/1/22/7
> >> https://lkml.org/lkml/2015/1/22/8
> >> I'd hoped we'd be able to fix that before this went further upstream.
> >> The easiest way I could see to do that was to merge my esr branch (which
> >> is stable and Catalin has pulled) branch into the kvm-arm tree, and fix
> >> the conflicts there.
> >> Is there any chance we can fix that now?
> > I'll fix the conflicts in the kvm tree. Please wait for further
> > instructions...
> Ok folks, please check that the resolution in the queue branch of
> git://git.kernel.org/pub/scm/virt/kvm/kvm.git is okay.
That looks fine to me. Git was happy to merge the arm64 for-next/core
branch, and the result boots fine on my Juno.
Thanks for handling the fixup!
More information about the linux-arm-kernel