From: Niklas Cassel <cassel@kernel.org>
To: Peter Zijlstra <peterz@infradead.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 12:44:02 +0200 [thread overview]
Message-ID: <ahgcch4MafhULYdp@ryzen> (raw)
In-Reply-To: <20260528102703.GE343181@noisy.programming.kicks-ass.net>
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 :)
>
> So I think I managed; there should now be tip/locking/context with just
> the one commit in and tip/locking/core has an extra merge commit.
>
> Bit ugly, but I've no idea if this can be done better.
It is correct, old locking/core and new locking/core are identical:
$ git diff 43a037d4fa6d tip/locking/core
I don't think it can be done in a nicer way.
(Yes, locking/core could be rebased on top of locking/context,
but I don't think that is nicer, as it would hides things.)
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")
in the libata tree, such that it does not matter which pull request Linus
merges first.
Thank you Peter!
Kind regards,
Niklas
next prev parent reply other threads:[~2026-05-28 10:44 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 [this message]
2026-05-28 11:15 ` Peter Zijlstra
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=ahgcch4MafhULYdp@ryzen \
--to=cassel@kernel.org \
--cc=bvanassche@acm.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=peterz@infradead.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.