From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751380AbcGNG67 (ORCPT ); Thu, 14 Jul 2016 02:58:59 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:55609 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751623AbcGNG6u (ORCPT ); Thu, 14 Jul 2016 02:58:50 -0400 X-IBM-Helo: d06dlp01.portsmouth.uk.ibm.com X-IBM-MailFrom: dahi@linux.vnet.ibm.com X-IBM-RcptTo: kvm@vger.kernel.org;linux-kernel@vger.kernel.org;linux-next@vger.kernel.org Date: Thu, 14 Jul 2016 08:58:13 +0200 From: David Hildenbrand To: Stephen Rothwell Cc: Marcelo Tosatti , Gleb Natapov , , Martin Schwidefsky , Heiko Carstens , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: manual merge of the kvm tree with the s390 tree In-Reply-To: <20160714140334.7009275f@canb.auug.org.au> References: <20160714140334.7009275f@canb.auug.org.au> Organization: IBM Deutschland GmbH X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-redhat-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: 16071406-0020-0000-0000-000001D2E05F X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16071406-0021-0000-0000-00001CB71DFF Message-Id: <20160714085813.71e0931c@thinkpad-w530> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-07-14_04:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=2 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1607140076 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > Hi all, > > Today's linux-next merge of the kvm tree got a conflict in: > > arch/s390/mm/gmap.c > > between commit: > > f04540298440 ("s390/mm: fix gmap tlb flush issues") > > from the s390 tree and commit: > > 6ea427bbbd40 ("s390/mm: add reference counter to gmap structure") > > from the kvm tree. > > I fixed it up (I just assumed that the update to gmap_free is no longer > needed) and can carry the fix as necessary. This is now fixed as far as > linux-next is concerned, but any non trivial conflicts should be mentioned > to your upstream maintainer when your tree is submitted for merging. > You may also want to consider cooperating with the maintainer of the > conflicting tree to minimise any particularly complex conflicts. > Yes, the tlb flush will be done in gmap_remove() instead of in gmap_free(), which is also fixed by commit f04540298440. Unfortunately, that stable fix was inevitable and collided with the already submitted patches for nested virtualization. Thanks for fixing that up, looks good to me. David