From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757692AbcHCCvy (ORCPT ); Tue, 2 Aug 2016 22:51:54 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:20027 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1757381AbcHCCvf (ORCPT ); Tue, 2 Aug 2016 22:51:35 -0400 X-IBM-Helo: d06dlp02.portsmouth.uk.ibm.com X-IBM-MailFrom: schwidefsky@de.ibm.com X-IBM-RcptTo: kvm@vger.kernel.org;linux-kernel@vger.kernel.org Date: Tue, 2 Aug 2016 17:36:47 -0400 From: Martin Schwidefsky To: Linus Torvalds 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 Subject: Re: [GIT PULL] KVM changes for 4.8 merge window In-Reply-To: References: <1470141468-120437-1-git-send-email-pbonzini@redhat.com> X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.23; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16080221-0036-0000-0000-0000020FB5D5 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16080221-0037-0000-0000-000011F1C6DF Message-Id: <20160802173647.2bc6f36f@mschwide> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-08-02_16:,, 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-1608020218 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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.