From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751293AbcGNEDr (ORCPT ); Thu, 14 Jul 2016 00:03:47 -0400 Received: from ozlabs.org ([103.22.144.67]:60607 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750934AbcGNEDh (ORCPT ); Thu, 14 Jul 2016 00:03:37 -0400 Date: Thu, 14 Jul 2016 14:03:34 +1000 From: Stephen Rothwell To: Marcelo Tosatti , Gleb Natapov , , Martin Schwidefsky , Heiko Carstens Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, David Hildenbrand Subject: linux-next: manual merge of the kvm tree with the s390 tree Message-ID: <20160714140334.7009275f@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit 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. -- Cheers, Stephen Rothwell