linux-kernel - Re: [GIT PULL] Block pull request for- 4.11-rc1

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <c536bde0-af28-bae3-3d6c-9ffb66139d6c@kernel.dk>
Date:   Tue, 21 Feb 2017 12:34:43 -0700
From:   Jens Axboe <axboe@...nel.dk>
To:     Linus Torvalds <torvalds@...ux-foundation.org>
Cc:     "linux-block@...r.kernel.org" <linux-block@...r.kernel.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL] Block pull request for- 4.11-rc1

On 02/21/2017 12:11 PM, Linus Torvalds wrote:
> On Sun, Feb 19, 2017 at 4:10 PM, Jens Axboe <axboe@...nel.dk> wrote:
>>
>> Please pull! Either this pre-merged branch:
>>
>>   git://git.kernel.dk/linux-block.git for-4.11/linus-merge-signed
>>
>> or
>>
>>   git://git.kernel.dk/linux-block.git for-4.11/block-signed
>>   git://git.kernel.dk/linux-block.git for-4.11/next-signed
> 
> So normally I'd merge them separately, but since you didn't actually
> give me explanations for what the two branches were (ie "block-signed
> does X, next-signed does Y") I didn't feel like I could write a sane
> merge message for the two branches - so I took the pre-merged one.
> 
> Which does bring me to my next issue: *your* merge messages suck too.
> They don't actually talk about what you are merging and why.
> 
> A merge is a commit, and needs to have a message, unless it's really
> really obvious (and they seldom are - merges are generally a lot less
> obvious than most non-merge commits). So just saying
> 
>     Merge branch 'for-4.11/block' into for-4.11/linus-merge
> 
>     Signed-off-by: Jens Axboe <axboe@...com>
> 
> is simply not an acceptable merge message. What are you merging, and why?
> 
> Please. We've been very good at having good commit messages in the
> kernel. Merges need good commit messages too!

You are right, and honestly I don't think I've ever done merge commit
messages for my own merges, I only do it when I merge other peoples
branches. I'll improve on it.

-- 
Jens Axboe