linux-kernel - Re: [GIT PULL] RAS updates for 5.18

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-=whR6pCHwvAWQKZ88D1hBuRJsV66ucEnybBiOHskoPsPxQ@mail.gmail.com>
Date:   Fri, 25 Mar 2022 13:51:54 -0700
From:   Linus Torvalds <torvalds@...ux-foundation.org>
To:     Borislav Petkov <bp@...e.de>
Cc:     x86-ml <x86@...nel.org>, lkml <linux-kernel@...r.kernel.org>
Subject: Re: [GIT PULL] RAS updates for 5.18

On Fri, Mar 25, 2022 at 1:40 PM Borislav Petkov <bp@...e.de> wrote:
>
> If I try to make it do a --ff, it still does a merge commit:

Oh, they indeed aren't fast-forwards of each other, they just looked
superficially that way to me because when I did my

   gitk ORIG_HEAD..

after merging, the fact that I had already merged everything else in
both of those branches.

So never mind. It wasn't a pointless fast-forward merge, it's just
that neither of those branches had anything new in them as far as I
was concerned any more.

              Linus