From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751844AbcFWQnf (ORCPT ); Thu, 23 Jun 2016 12:43:35 -0400 Received: from mail.kernel.org ([198.145.29.136]:46248 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750950AbcFWQnd (ORCPT ); Thu, 23 Jun 2016 12:43:33 -0400 Date: Thu, 23 Jun 2016 11:43:29 -0500 From: Bjorn Helgaas To: Stephen Rothwell Cc: Bjorn Helgaas , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Johannes Thumshirn , Jens Axboe Subject: Re: linux-next: manual merge of the pci tree with Linus' tree Message-ID: <20160623164329.GD17987@localhost> References: <20160623114429.1815794f@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20160623114429.1815794f@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jun 23, 2016 at 11:44:29AM +1000, Stephen Rothwell wrote: > Hi Bjorn, > > Today's linux-next merge of the pci tree got a conflict in: > > drivers/nvme/host/pci.c > > between commit: > > edb50a5403d2 ("NVMe: Only release requested regions") > > from Linus' tree and commit: > > a1f447b35b72 ("NVMe: Use pci_(request|release)_mem_regions") > > from the pci tree. > > I fixed it up (I just used the pci tree version of this file) 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. Thanks for the heads-up. I think using the pci tree version is the correct resolution. Bjorn