From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751430AbcAUWsZ (ORCPT ); Thu, 21 Jan 2016 17:48:25 -0500 Received: from mail-pf0-f174.google.com ([209.85.192.174]:33547 "EHLO mail-pf0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750758AbcAUWsX (ORCPT ); Thu, 21 Jan 2016 17:48:23 -0500 Subject: Re: linux-next: manual merge of the block tree with Linus' tree To: Stephen Rothwell References: <20151231143457.1004a5bd@canb.auug.org.au> <20160122094601.3a998af1@canb.auug.org.au> Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Keith Busch , Christoph Hellwig From: Jens Axboe Message-ID: <56A16033.9050007@kernel.dk> Date: Thu, 21 Jan 2016 15:48:19 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: <20160122094601.3a998af1@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 01/21/2016 03:46 PM, Stephen Rothwell wrote: > Hi Jens, > > On Thu, 31 Dec 2015 14:34:57 +1100 Stephen Rothwell wrote: >> >> Today's linux-next merge of the block tree got a conflict in: >> >> drivers/nvme/host/pci.c >> >> between commit: >> >> b5875222de2f ("NVMe: IO ending fixes on surprise removal") >> >> from Linus' tree and commit: >> >> 5bae7f73d378 ("nvme: move namespace scanning to common code") >> >> from the block tree. >> >> I fixed it up (the code was moved - I added the fix patch below) and >> can carry the fix as necessary (no action is required). >> >> However, there was another part to the former patch that I could not >> quite figure out how to reproduce - the fix to nvme_dev_remove(). >> >> From: Stephen Rothwell >> Date: Thu, 31 Dec 2015 14:21:38 +1100 >> Subject: [PATCH] nvme: merge fix up for ns code movement >> >> Signed-off-by: Stephen Rothwell >> --- >> drivers/nvme/host/core.c | 11 ++++++++++- >> 1 file changed, 10 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c >> index 1437ff36e91c..1375a83593b5 100644 >> --- a/drivers/nvme/host/core.c >> +++ b/drivers/nvme/host/core.c >> @@ -1118,8 +1118,17 @@ static void nvme_ns_remove(struct nvme_ns *ns) >> bool kill = nvme_io_incapable(ns->ctrl) && >> !blk_queue_dying(ns->queue); >> >> - if (kill) >> + if (kill) { >> blk_set_queue_dying(ns->queue); >> + >> + /* >> + * The controller was shutdown first if we got here through >> + * device removal. The shutdown may requeue outstanding >> + * requests. These need to be aborted immediately so >> + * del_gendisk doesn't block indefinitely for their completion. >> + */ >> + blk_mq_abort_requeue_list(ns->queue); >> + } >> if (ns->disk->flags & GENHD_FL_UP) { >> if (blk_get_integrity(ns->disk)) >> blk_integrity_unregister(ns->disk); >> -- >> 2.6.4 > > So, I have been applying the above merge fix patch since Dec 31 and now > wonder if Linus needs to be told about it. Also noone every replied > about the nvme_dev_remove() part. Linus is usually pretty damn good at figuring out, and seems to have fun doing it. So I usually just defer to acking a merge resolution, but even that is rarely needed. It was more of a mess this time around between mainline and the nvme branch than I would have liked though, but mostly due to timing of branching. -- Jens Axboe