From mboxrd@z Thu Jan  1 00:00:00 1970
From: Paolo Bonzini <pbonzini@redhat.com>
Subject: Re: [GIT PULL 0/8] KVM: s390: Features and fixes for 4.1 (kvm/next)
Date: Tue, 31 Mar 2015 18:14:11 +0200
Message-ID: <551AC7D3.5010408@redhat.com>
References: <1427806923-21910-1-git-send-email-borntraeger@de.ibm.com> <551AC726.7000407@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Cc: Marcelo Tosatti <mtosatti@redhat.com>,
	Alexander Graf <agraf@suse.de>,
	Cornelia Huck <cornelia.huck@de.ibm.com>,
	Jens Freimann <jfrei@linux.vnet.ibm.com>,
	linux-s390 <linux-s390@vger.kernel.org>
To: Christian Borntraeger <borntraeger@de.ibm.com>,
	KVM <kvm@vger.kernel.org>
Return-path: <kvm-owner@vger.kernel.org>
Received: from mail-wi0-f170.google.com ([209.85.212.170]:35388 "EHLO
	mail-wi0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1751817AbbCaQOR (ORCPT <rfc822;kvm@vger.kernel.org>);
	Tue, 31 Mar 2015 12:14:17 -0400
In-Reply-To: <551AC726.7000407@redhat.com>
Sender: kvm-owner@vger.kernel.org
List-ID: <kvm.vger.kernel.org>



On 31/03/2015 18:11, Paolo Bonzini wrote:
> 
> 
> On 31/03/2015 15:01, Christian Borntraeger wrote:
>>   git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git  tags/kvm-s390-next-20150331
> 
> Looks good, pulled.

Oops, spoke too soon!  It conflicts with the MIPS pull request due to
overlapping capability numbers.  Please use 113 and 114; since the MIPS
pull request is in kvm/queue only, do not rebase: just fix the two
numbers and I'll resolve the conflict myself.

Paolo