From mboxrd@z Thu Jan  1 00:00:00 1970
From: Paolo Bonzini <pbonzini@redhat.com>
Subject: Re: [GIT PULL 03/36] arm/arm64: KVM: add tracing support for arm64
 exit handler
Date: Fri, 23 Jan 2015 13:01:50 +0100
Message-ID: <54C2382E.6040800@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>
Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Cc: "kvmarm@lists.cs.columbia.edu" <kvmarm@lists.cs.columbia.edu>,
	"linux-arm-kernel@lists.infradead.org"
	<linux-arm-kernel@lists.infradead.org>,
	"kvm@vger.kernel.org" <kvm@vger.kernel.org>,
	Andre Przywara <Andre.Przywara@arm.com>
To: Mark Rutland <mark.rutland@arm.com>,
	Christoffer Dall <christoffer.dall@linaro.org>,
	Marc Zyngier <marc.zyngier@arm.com>,
	Catalin Marinas <catalin.marinas@arm.com>,
	Will Deacon <will.deacon@arm.com>
Return-path: <kvm-owner@vger.kernel.org>
Received: from mx1.redhat.com ([209.132.183.28]:54611 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752249AbbAWMCa (ORCPT <rfc822;kvm@vger.kernel.org>);
	Fri, 23 Jan 2015 07:02:30 -0500
In-Reply-To: <20150123113515.GF23493@leverpostej>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>



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...

Paolo