From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Wu, Feng" <feng.wu@intel.com>
Subject: RE: linux-next: manual merge of the kvm-arm tree with the kvm tree
Date: Fri, 16 Oct 2015 04:20:16 +0000
Message-ID: <E959C4978C3B6342920538CF579893F00ADDDC19@SHSMSX104.ccr.corp.intel.com>
References: <20151016145300.7f03fbcb@canb.auug.org.au>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 8BIT
Cc: "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Christian Borntraeger <borntraeger@de.ibm.com>,
	Cornelia Huck <cornelia.huck@de.ibm.com>,
	"Wu, Feng" <feng.wu@intel.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	Christoffer Dall <cdall@cs.columbia.edu>,
	Marc Zyngier <marc.zyngier@arm.com>,
	Marcelo Tosatti <mtosatti@redhat.com>,
	Gleb Natapov <gleb@kernel.org>,
	"kvm@vger.kernel.org" <kvm@vger.kernel.org>
Return-path: <linux-kernel-owner@vger.kernel.org>
In-Reply-To: <20151016145300.7f03fbcb@canb.auug.org.au>
Content-Language: en-US
Sender: linux-kernel-owner@vger.kernel.org
List-Id: kvm.vger.kernel.org



> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@canb.auug.org.au]
> Sent: Friday, October 16, 2015 11:53 AM
> To: Christoffer Dall <cdall@cs.columbia.edu>; Marc Zyngier
> <marc.zyngier@arm.com>; Marcelo Tosatti <mtosatti@redhat.com>; Gleb
> Natapov <gleb@kernel.org>; kvm@vger.kernel.org
> Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Wu, Feng
> <feng.wu@intel.com>; Paolo Bonzini <pbonzini@redhat.com>; Christian
> Borntraeger <borntraeger@de.ibm.com>; Cornelia Huck
> <cornelia.huck@de.ibm.com>
> Subject: linux-next: manual merge of the kvm-arm tree with the kvm tree
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks Stephen!

Thanks,
Feng