linux-kernel - Re: [GIT PULL] thermal for v5.12-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: <CAHk-=wiaespvE0HmhpJhcNsJXob6WJCH0BdD5XuvBJP7KF_EFg@mail.gmail.com>
Date:   Mon, 22 Feb 2021 09:44:52 -0800
From:   Linus Torvalds <torvalds@...ux-foundation.org>
To:     Daniel Lezcano <daniel.lezcano@...aro.org>
Cc:     Zhang Rui <rui.zhang@...el.com>,
        Kai-Heng Feng <kai.heng.feng@...onical.com>,
        Lukasz Luba <Lukasz.Luba@....com>,
        Arnd Bergmann <arnd@...nel.org>,
        Tony Lindgren <tony@...mide.com>,
        Dmitry Baryshkov <dmitry.baryshkov@...aro.org>,
        Colin King <colin.king@...onical.com>,
        Viresh Kumar <viresh.kumar@...aro.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux PM mailing list <linux-pm@...r.kernel.org>
Subject: Re: [GIT PULL] thermal for v5.12-rc1

On Fri, Feb 19, 2021 at 3:54 AM Daniel Lezcano
<daniel.lezcano@...aro.org> wrote:
>
> Note a set of changes for the qcom adc driver rely on an immutable
> branch from the iio tree:

That part is fine, but what _isn't_ great is the merge commit message.

This is the message in its entirety:

   "Merge remote-tracking branch
'iio-thermal-5.11-rc1/ib-iio-thermal-5.11-rc1' into testing"

Notice how it doesn't say _anything_ useful.

Merges are commits, and they should have commit messages with
*explanation* the same way all regular commits should. In fact, they
generally should have *more* explanation, since they are fundamentally
more interesting and subtle than some one-liner obvious bug-fix.

So this all looks otherwise fine, and I like how you were clearly
aware of the whole cross-tree merge, and how you let me kn0ow about
it. I appreciate that part, and I've pulled your branch.

But I wanted to really take this moment to point out that merge
commits really should have messages explaining *why* and *what* got
merged. Not just the technical "I merged that tree".

           Linus