From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paolo Bonzini Subject: Re: [GIT PULL 03/36] arm/arm64: KVM: add tracing support for arm64 exit handler Date: Fri, 23 Jan 2015 13:49:41 +0100 Message-ID: <54C24365.1000503@redhat.com> References: <1422007385-14730-1-git-send-email-christoffer.dall@linaro.org> <1422007385-14730-4-git-send-email-christoffer.dall@linaro.org> <20150123113515.GF23493@leverpostej> <54C2382E.6040800@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Cc: "kvmarm@lists.cs.columbia.edu" , "linux-arm-kernel@lists.infradead.org" , "kvm@vger.kernel.org" , Andre Przywara To: Mark Rutland , Christoffer Dall , Marc Zyngier , Catalin Marinas , Will Deacon Return-path: Received: from mail-we0-f174.google.com ([74.125.82.174]:53869 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752810AbbAWMtq (ORCPT ); Fri, 23 Jan 2015 07:49:46 -0500 Received: by mail-we0-f174.google.com with SMTP id x3so7388042wes.5 for ; Fri, 23 Jan 2015 04:49:45 -0800 (PST) In-Reply-To: <54C2382E.6040800@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: 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. Paolo