From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754203AbcAVP7G (ORCPT ); Fri, 22 Jan 2016 10:59:06 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:49714 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753796AbcAVP7E (ORCPT ); Fri, 22 Jan 2016 10:59:04 -0500 Subject: Re: [GIT PULL] NVMe changes for 4.5-rc1 To: Linus Torvalds , Keith Busch References: <20160121212738.GA15727@kernel.dk> CC: Linux Kernel Mailing List , From: Jens Axboe Message-ID: <56A251C2.101@fb.com> Date: Fri, 22 Jan 2016 08:58:58 -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: Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit X-Originating-IP: [192.168.54.13] X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-01-22_06:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 01/21/2016 08:58 PM, Linus Torvalds wrote: > On Thu, Jan 21, 2016 at 1:27 PM, Jens Axboe wrote: >> >> Note that pulling this in will conflict with master, since the code was >> forked off pretty early, and we had a good chunk of nvme fixes later in >> the 4.4 cycle. > > Not just conflict, but conflict in bad ways. I don't think I'll be > able to fix it up sanely. > > In particular, commit b5875222de2f ("NVMe: IO ending fixes on surprise > removal") by Keith Busch added this to nvme_dev_remove(): > > if (nvme_io_incapable(dev)) { > /* > * If the device is not capable of IO (surprise hot-removal, > * for example), we need to quiesce prior to deleting the > * namespaces. This will end outstanding requests and prevent > * attempts to sync dirty data. > */ > nvme_dev_shutdown(dev); > } > > and in your branch we now have: > > - nvme_dev_shutdown() is now nvme_dev_disable(dev, false). Fine. > > - nvme_dev_remove() got renamed to nvme_remove_namespaces(), but also > lost the "dev" argument (it takes "struct nvme_ctrl *ctrl" now). &dev->ctrl > I think I will end up doing the merge by just dropping that part of > the surprise removal commit, and letting you and Keith work out what > the real solution is.. That's fine, thanks for merging! -- Jens Axboe