linux-kernel - Re: [GIT PULL] s390 updates for 6.3 merge window

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] [day] [month] [year] [list]

Message-ID: <Y/XNLAxrg9ZCxlsH@osiris>
Date:   Wed, 22 Feb 2023 09:07:08 +0100
From:   Heiko Carstens <hca@...ux.ibm.com>
To:     Linus Torvalds <torvalds@...ux-foundation.org>
Cc:     Vasily Gorbik <gor@...ux.ibm.com>,
        Alexander Gordeev <agordeev@...ux.ibm.com>,
        Christian Borntraeger <borntraeger@...ux.ibm.com>,
        Gerald Schaefer <gerald.schaefer@...ux.ibm.com>,
        linux-s390@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [GIT PULL] s390 updates for 6.3 merge window

On Tue, Feb 21, 2023 at 03:15:09PM -0800, Linus Torvalds wrote:
> On Mon, Feb 20, 2023 at 4:02 AM Heiko Carstens <hca@...ux.ibm.com> wrote:
> >
> > Also the shortstat when merging will look slightly different to the one
> > generated with 'git request-pull' below, since I merged our fixes branch
> > twice to avoid merge conflicts.
> 
> Please don't do that unless the merge conflicts are really nasty - and
> when you do, please *explain* it.
> 
> Looking at those two merges, I
> 
>  (a) see no sign of complex conflicts (the conflict diff is completely
> empty for both of them)
> 
>  (b) see zero explanation for why the merge exists at all
> 
> Please consider merges to be real commits (they are!) and needing all
> the same commit messages explaining them that normal commits have
> (they do!).

Ok. The fixes branch was merged since other commits which were applied
relied on commits in the fixes branch.

But as you yesterday already outlined as reply to the hardening pull
request this rather should have been a separate topic branch, which then
would also allow for a proper merge commit message.

We will do that from now on for the s390 tree.