News for hackers. Stuff that matters.
Re:Teardown of a Failed Linux LTS Spectre Fix by the8472 on Wednesday September 04, 2019 @10:59AM (#20877770)
Maybe linus' fix should have been added as separate commit to a branch instead of putting the fix in the merge commit itself? Then the entire branch could be taken and rebased, or at least the range cherry-picked.
Re:Teardown of a Failed Linux LTS Spectre Fix by stonesixone on Wednesday September 04, 2019 @01:39PM (#20879546)
Indeed, this is called an "evil merge" [1], and here's [2] even an email with Linus mentioning it. I'm surprised the blog post doesn't mention evil merges by name, as this seems to be a prime example of why they're called evil.

[1]: https://git-scm.com/docs/gitglossary#Documentation/gitglossa...

[2]: https://www.mail-archive.com/[email protected]/msg73938.ht...

Re:Teardown of a Failed Linux LTS Spectre Fix by 0x0 on Wednesday September 04, 2019 @12:34PM (#20878835)
That's what I was thinking too. Extra diff changes in a merge commit is often hard to notice