From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751554AbcFWBoe (ORCPT ); Wed, 22 Jun 2016 21:44:34 -0400 Received: from ozlabs.org ([103.22.144.67]:43384 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751000AbcFWBoc (ORCPT ); Wed, 22 Jun 2016 21:44:32 -0400 Date: Thu, 23 Jun 2016 11:44:29 +1000 From: Stephen Rothwell To: Bjorn Helgaas Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Johannes Thumshirn , Jens Axboe Subject: linux-next: manual merge of the pci tree with Linus' tree Message-ID: <20160623114429.1815794f@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 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. -- Cheers, Stephen Rothwell