Re: [GIT PULL] RAS updates for 5.18

[Linus Torvalds]

On Fri, Mar 25, 2022 at 1:40 PM Borislav Petkov <bp@xxxxxxx> 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