Re: [tip: locking/core] compiler-context-analysis: Bump required Clang version to 23

[Peter Zijlstra]

On Thu, May 28, 2026 at 12:44:02PM +0200, Niklas Cassel wrote:
> On Thu, May 28, 2026 at 12:27:03PM +0200, Peter Zijlstra wrote:
> > On Thu, May 28, 2026 at 11:37:22AM +0200, Peter Zijlstra wrote:
> > 
> > > > Would it be possible for you to provide an immutable branch with only
> > > > this specific commit, such that I could merge that immutable branch to
> > > > libata/for-next (such that we carry the exact same SHA1) in both trees?
> > > 
> > > I think that means I have to rebase tip/locking/core; pull out that
> > > patch and stick it in a separate branch and then merge the two branches,
> > > right? Git and me never really get along well.
> > > 
> > > Let me see if I can do this without destroying stuff :-)
> 
> Hehe :)
> 
> It gives me a smile that you can debug intricate scheduler bugs,
> but get worried about a simple git rebase :)

Somewhere along the line I have failed to understand something
fundamental about git and it just doesn't want to make sense to me :/

I can mostly get things done, but I'm never confident because of this
misunderstanding, things feel off.

There's things like: A...B, A..B, B..A, B...A for ranges that are all
weirdly different (eg. I would expect A...B to get me the reverse diff
from B...A, but afaiu that is very much not the case, and wtf is the two
dots vs three dots thing anyway), and then there's sha:file but also sha
-- file in random and mysterious ways.

And there is bisection across non linear history, and then I never know
WTF the thing does. Often I end up linearising things and then bisect
that, but this can't be right.

Anyway, I've tried to read the man page, and various random web
ramblings on these things, but it just doesn't want to make sense.

So I stick to mostly using quilt and occasionally touch git when I
absolutely have to, like now.

And actually doing rebases with conflicts is the absolute worst possible
thing. I often just pull the patches from git, rebase using quilt and
then re-commit. Git is just actively making that the most painful
experience ever.

Anyway, that's my rant done, sorry about that :-)

> Just to be explicit: I assume that I have your approval to also carry this
> single/exact SHA1:
> f45c5c4adb27 ("compiler-context-analysis: Bump required Clang version to 23")

Yes, that was the whole point of this exercise after all.