From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753295AbbJPEUV (ORCPT <rfc822;w@1wt.eu>);
	Fri, 16 Oct 2015 00:20:21 -0400
Received: from mga11.intel.com ([192.55.52.93]:2544 "EHLO mga11.intel.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1750746AbbJPEUT convert rfc822-to-8bit (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 16 Oct 2015 00:20:19 -0400
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.17,687,1437462000"; 
   d="scan'208";a="581875015"
From: "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>
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>
Subject: RE: linux-next: manual merge of the kvm-arm tree with the kvm tree
Thread-Topic: linux-next: manual merge of the kvm-arm tree with the kvm tree
Thread-Index: AQHRB8YyLK7IegT8rk+ki8e4MRtQvJ5thC5w
Date: Fri, 16 Oct 2015 04:20:16 +0000
Message-ID: <E959C4978C3B6342920538CF579893F00ADDDC19@SHSMSX104.ccr.corp.intel.com>
References: <20151016145300.7f03fbcb@canb.auug.org.au>
In-Reply-To: <20151016145300.7f03fbcb@canb.auug.org.au>
Accept-Language: en-US
Content-Language: en-US
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
x-originating-ip: [10.239.127.40]
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 8BIT
MIME-Version: 1.0
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@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