linux-kernel - Re: Linux 5.15-rc6

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: <YXcJ6wQxW72aaGYB@sirena.org.uk>
Date:   Mon, 25 Oct 2021 20:47:55 +0100
From:   Mark Brown <broonie@...nel.org>
To:     Linus Torvalds <torvalds@...ux-foundation.org>
Cc:     Guenter Roeck <linux@...ck-us.net>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: Linux 5.15-rc6

On Mon, Oct 25, 2021 at 11:07:16AM -0700, Linus Torvalds wrote:

> Mark, please stop doing these mindless AND INCORRECT back-merges of my
> tree. There is absolutely no excuse for garbage like this:

Sorry about that.  JFTR (and bearing in mind your other points) it looks
like I messed up the first time and then didn't notice that the bad
merge was in my rerere cache the second time, if I am doing these I
should remember to specify --no-rerere-autoupdate so that any mistakes
that do happen are less likely to get repeated.

> If you really need to do a back-merge, explain WHY. And it had better
> be some important reason.

> In particular, the reson should not be "fix conflict", because you're
> clearly not particularly good at it.

A good portion (I'm pretty sure the majority) of the backmerges I do are
due to dependencies for new patches, but obviously you can't tell that
without something in the commit log which like you say should be there
and will be in future.

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)