From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751282AbcGMQbt (ORCPT ); Wed, 13 Jul 2016 12:31:49 -0400 Received: from mail-pf0-f177.google.com ([209.85.192.177]:34742 "EHLO mail-pf0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751009AbcGMQbl (ORCPT ); Wed, 13 Jul 2016 12:31:41 -0400 Subject: Re: linux-next: manual merge of the akpm-current tree with the block tree To: Stephen Rothwell , Andrew Morton References: <20160713161448.7cedd072@canb.auug.org.au> Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, NeilBrown , Keith Busch From: Jens Axboe Message-ID: <57866CCC.20707@kernel.dk> Date: Wed, 13 Jul 2016 09:31:08 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.8.0 MIME-Version: 1.0 In-Reply-To: <20160713161448.7cedd072@canb.auug.org.au> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 07/12/2016 11:14 PM, Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the akpm-current tree got a conflict in: > > drivers/nvme/host/core.c > > between commit: > > f80ec966c19b ("nvme: Limit command retries") > > from the block tree and commit: > > 8cc07e463b0c ("NVMe: don't allocate unused nvme_major") > > from the akpm-current tree. > > I fixed it up (see below) 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. Usually I'm not that picky with trivial stuff going through other trees, but with the amount of churn we have in NVMe, it really should go through the block tree. -- Jens Axboe