Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753795AbcCSAch (ORCPT ); Fri, 18 Mar 2016 20:32:37 -0400 Received: from mail-io0-f171.google.com ([209.85.223.171]:35057 "EHLO mail-io0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751482AbcCSAca (ORCPT ); Fri, 18 Mar 2016 20:32:30 -0400 MIME-Version: 1.0 In-Reply-To: <20160318173305.GB15491@kernel.dk> References: <20160318173305.GB15491@kernel.dk> Date: Fri, 18 Mar 2016 17:32:29 -0700 X-Google-Sender-Auth: mGhvU5O4kJ3D9o_w4gO_tc4hCjQ Message-ID: Subject: Re: [GIT PULL] Block driver changes for 4.6-rc From: Linus Torvalds To: Jens Axboe Cc: Linux Kernel Mailing List , linux-block@vger.kernel.org Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1436 Lines: 46 On Fri, Mar 18, 2016 at 10:33 AM, Jens Axboe wrote: > > 1) Pull for-4.6/drivers and do the merges yourself. This is the original > branch. > > 2) Pull for-4.6/drivers-merged, which is the above branch, but with v4.5 > merged into it and the merges resolved cleanly. I don't think your merge is correct. I pushed out mine. So the differences are (apart from purely newline changes): - you kept the early "flush_work(&dev->reset_work)", so your merge didn't take the changes from commit ff23a2a15a2117245b4599c1352343c8b8fb4c43 properly, and you flush the work twice. I don't know that it matters, but it looks odd. - Your merge dropped the nvme_dev_disable() from nvme_remove_dead_ctrl(), added by commit 69d9a99c258eb1d6478fd9608a2070890797eed7 - Your merge kept the redundant dev_set_drvdata() in nvme_init_ctrl(), removed by commit f4f0f63e6f01055dfbdb7bc5e83935e1bdfa1980. Anyway, since I got a different merge result than you did, you should double-check, but I think I did the merge correctly. But I don't know the code nor the hardware, so I'm just going by reading the commits. I also do have to ask: why the hell is nvme development done in that insane way? Why the f*ck can people not work together? Why are these two different groups messing with each others code? Tell them to stop. I'm not happy with how messy these block layer pulls are. Linus Linus