The Linux Kernel Mailing List
 help / color / mirror / Atom feed
From: Peter Zijlstra <peterz@infradead.org>
To: Niklas Cassel <cassel@kernel.org>
Cc: linux-kernel@vger.kernel.org, linux-tip-commits@vger.kernel.org,
	Marco Elver <elver@google.com>,
	Nathan Chancellor <nathan@kernel.org>,
	Bart Van Assche <bvanassche@acm.org>,
	x86@kernel.org, dlemoal@kernel.org
Subject: Re: [tip: locking/core] compiler-context-analysis: Bump required Clang version to 23
Date: Thu, 28 May 2026 13:15:18 +0200	[thread overview]
Message-ID: <20260528111518.GJ343181@noisy.programming.kicks-ass.net> (raw)
In-Reply-To: <ahgcch4MafhULYdp@ryzen>

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.

  reply	other threads:[~2026-05-28 11:15 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-05-15 12:43 [PATCH tip/locking/core v3] compiler-context-analysis: Bump required Clang version to 23 Marco Elver
2026-05-15 12:50 ` Marco Elver
2026-05-15 15:31 ` Bart Van Assche
2026-05-20  8:28 ` [tip: locking/core] " tip-bot2 for Marco Elver
2026-05-28  9:12   ` Niklas Cassel
2026-05-28  9:37     ` Peter Zijlstra
2026-05-28 10:27       ` Peter Zijlstra
2026-05-28 10:44         ` Niklas Cassel
2026-05-28 11:15           ` Peter Zijlstra [this message]
2026-05-28 10:30 ` tip-bot2 for Marco Elver

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260528111518.GJ343181@noisy.programming.kicks-ass.net \
    --to=peterz@infradead.org \
    --cc=bvanassche@acm.org \
    --cc=cassel@kernel.org \
    --cc=dlemoal@kernel.org \
    --cc=elver@google.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=nathan@kernel.org \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox