Re: [GIT PULL] Block driver updates for 5.14-rc1

[Jens Axboe <axboe@kernel.dk>]

On 6/30/21 1:29 PM, Linus Torvalds wrote:
> On Tue, Jun 29, 2021 at 12:55 PM Jens Axboe <axboe@kernel.dk> wrote:
>>
>> Note that this will throw a trivial merge conflict in
>> drivers/nvme/host/fabrics.c due to the NVME_SC_HOST_PATH_ERROR addition.
> 
> Grr.
> 
> I don't mind the conflict. It's trivial, as you say.
> 
> I *do* mind what the conflict unearthed: commit 63d20f54a3d0
> ("nvme-fabrics: remove extra new lines in the switch").
> 
> That commit claims to remove new-lines. In fact, the full commit
> message explicitly says "No functionality change in this patch".
> 
> Except what it does is not just non-functional whitespace cleanup. No,
> it adds that
> 
>         case NVME_SC_HOST_PATH_ERROR:
> 
> thing that was added in mainline too by commit 4d9442bf263a
> ("nvme-fabrics: decode host pathing error for connect").
> 
> THAT is not ok. Commit messages that explicitly say one thing, and
> then do something completely different are very bad.

Agree, that's beyond ugly, I should have caught that.

-- 
Jens Axboe