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 S1162553AbbKTKBd (ORCPT <rfc822;w@1wt.eu>);
	Fri, 20 Nov 2015 05:01:33 -0500
Received: from e06smtp14.uk.ibm.com ([195.75.94.110]:33841 "EHLO
	e06smtp14.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1162437AbbKTKB2 (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Fri, 20 Nov 2015 05:01:28 -0500
X-IBM-Helo: d06dlp03.portsmouth.uk.ibm.com
X-IBM-MailFrom: borntraeger@de.ibm.com
X-IBM-RcptTo: kvm@vger.kernel.org;linux-kernel@vger.kernel.org;linux-next@vger.kernel.org
Subject: Re: linux-next: manual merge of the kvms390 tree with the kvm tree
To: Stephen Rothwell <sfr@canb.auug.org.au>,
        Cornelia Huck <cornelia.huck@de.ibm.com>,
        Marcelo Tosatti <mtosatti@redhat.com>, Gleb Natapov <gleb@kernel.org>,
        kvm@vger.kernel.org
References: <20151120124717.4179e98b@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        David Hildenbrand <dahi@linux.vnet.ibm.com>
From: Christian Borntraeger <borntraeger@de.ibm.com>
Message-ID: <564EEF70.5020205@de.ibm.com>
Date: Fri, 20 Nov 2015 11:01:20 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101
 Thunderbird/38.3.0
MIME-Version: 1.0
In-Reply-To: <20151120124717.4179e98b@canb.auug.org.au>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
X-TM-AS-MML: disable
X-Content-Scanned: Fidelis XPS MAILER
x-cbid: 15112010-0017-0000-0000-00000643E5F7
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 11/20/2015 02:47 AM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the kvms390 tree got a conflict in:
> 
>   include/linux/kvm_host.h
>   arch/s390/kvm/interrupt.c
>   arch/s390/kvm/sigp.c
> 
> between commits:
> 
>   db27a7a37aa0 ("KVM: Provide function for VCPU lookup by id")
>   b85de33a1a34 ("KVM: s390: avoid memory overwrites on emergency signal injection")
>   152e9f65d66f ("KVM: s390: fix wrong lookup of VCPUs by array index")
> 
> from the kvm tree and commit:
> 
>   a8ab7a5fd13b ("KVM: Provide function for VCPU lookup by id")
>   e896d1d08efc ("KVM: s390: avoid memory overwrites on emergency signal injection")
>   32d7bd98e799 ("KVM: s390: fix wrong lookup of VCPUs by array index")
> 
> from the kvms390 tree.
> 
> These patches used different names for the added function.  I used the
> name from the kvm tree (kvm_get_vcpu_by_id).

Yes, correct.


> This should probably all be cleaned up in the kvms390 tree.

Absolutely. Sorry for the hazzle. I had fixed that up but forgot to
push out. Should be fixed now.

Christian