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 S1756652AbcHCALB (ORCPT <rfc822;w@1wt.eu>);
	Tue, 2 Aug 2016 20:11:01 -0400
Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:11363 "EHLO
	mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1753530AbcHCAKv (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Tue, 2 Aug 2016 20:10:51 -0400
X-IBM-Helo: d06dlp01.portsmouth.uk.ibm.com
X-IBM-MailFrom: borntraeger@de.ibm.com
X-IBM-RcptTo: kvm@vger.kernel.org;linux-kernel@vger.kernel.org
Subject: Re: [GIT PULL] KVM changes for 4.8 merge window
To: Linus Torvalds <torvalds@linux-foundation.org>
References: <1470141468-120437-1-git-send-email-pbonzini@redhat.com>
 <e9b5bf31-5d68-1eb6-3706-2965bfd98c8c@de.ibm.com>
 <CA+55aFxxwPHKWQLKhHkCh8Tk_1GqrA7Mzrew0gu0KT4foPKi-A@mail.gmail.com>
 <CA+55aFyFTW8mSwe3s2VfM=Y7AYqKgz31gqRCHQmH3C1byOeJdA@mail.gmail.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= <rkrcmar@redhat.com>,
        KVM list <kvm@vger.kernel.org>,
        Christoffer Dall <christoffer.dall@linaro.org>,
        Dan Williams <dan.j.williams@intel.com>,
        Marc Zyngier <marc.zyngier@arm.com>,
        Paul Mackerras <paulus@ozlabs.org>,
        Michael Ellerman <mpe@ellerman.id.au>,
        Martin Schwidefsky <schwidefsky@de.ibm.com>,
        Heiko Carstens <heiko.carstens@de.ibm.com>
From: Christian Borntraeger <borntraeger@de.ibm.com>
Date: Tue, 2 Aug 2016 22:49:48 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101
 Thunderbird/45.2
MIME-Version: 1.0
In-Reply-To: <CA+55aFyFTW8mSwe3s2VfM=Y7AYqKgz31gqRCHQmH3C1byOeJdA@mail.gmail.com>
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
X-TM-AS-MML: disable
X-Content-Scanned: Fidelis XPS MAILER
x-cbid: 16080220-0020-0000-0000-000001E172BD
X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused
x-cbparentid: 16080220-0021-0000-0000-00001CF91FEC
Message-Id: <65d8f703-e60a-4cd0-7a6a-2c8eff493a8b@de.ibm.com>
X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-08-02_15:,,
 signatures=0
X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0
 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam
 adjust=0 reason=mlx scancount=1 engine=8.0.1-1606300000
 definitions=main-1608020212
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 08/02/2016 10:17 PM, Linus Torvalds wrote:
> On Tue, Aug 2, 2016 at 2:42 PM, Linus Torvalds
> <torvalds@linux-foundation.org> wrote:
>>
>> No, I don't use the merge from linux-next directly. I just re-generate
>> the merge myself, and if the pull request then includes a merge
>> resolution (either as just a verbal description, or a patch or by
>> having a separate "merged" test-branch), I will compare my merge with
>> that one.
> 
> Ok, the KVM merge was indeed the most painful one this merge window so
> far. Which isn't saying all that much, since this merge window has so
> far been pretty good (knock wood).
> 
> Let's see if I got everything right. I did pick up the fixup patch
> from Sudip and made it part of the merge, so that hopefully it's all
> complete and also bisectable.
> 
> Please do check it out. And let's hope the KVM people have learnt
> their lesson and we won't have these messy merges in the future.

s390 kvm compiles fine and seems to work. (new features vsie, sthyi 
and cpu model and a simple regression worked fine). Thanks

Christian