From mboxrd@z Thu Jan 1 00:00:00 1970 From: Martin Schwidefsky Subject: Re: [GIT PULL] KVM changes for 4.8 merge window Date: Tue, 2 Aug 2016 17:36:47 -0400 Message-ID: <20160802173647.2bc6f36f@mschwide> References: <1470141468-120437-1-git-send-email-pbonzini@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: Christian Borntraeger , Paolo Bonzini , Linux Kernel Mailing List , Radim =?UTF-8?B?S3LEjW3DocWZ?= , KVM list , Christoffer Dall , Dan Williams , Marc Zyngier , Paul Mackerras , Michael Ellerman , Heiko Carstens To: Linus Torvalds Return-path: Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:61830 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755893AbcHCAFC (ORCPT ); Tue, 2 Aug 2016 20:05:02 -0400 Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u72LWjSG007678 for ; Tue, 2 Aug 2016 17:36:58 -0400 Received: from e06smtp09.uk.ibm.com (e06smtp09.uk.ibm.com [195.75.94.105]) by mx0a-001b2d01.pphosted.com with ESMTP id 24k0bkyay9-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 02 Aug 2016 17:36:58 -0400 Received: from localhost by e06smtp09.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 2 Aug 2016 22:36:56 +0100 In-Reply-To: Sender: kvm-owner@vger.kernel.org List-ID: On Tue, 2 Aug 2016 16:17:39 -0400 Linus Torvalds wrote: > On Tue, Aug 2, 2016 at 2:42 PM, Linus Torvalds > 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. I included my try to fixup the expected merge conflict between the KVM tree and the s390 tree at the end of the first please-merge email for s390. Dunno if you have noticed this, the merge result looks good to me. -- blue skies, Martin. "Reality continues to ruin my life." - Calvin.