From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
To: "Luis Claudio R. Goncalves" <lgoncalv@redhat.com>
Cc: Bryan Brattlof <bb@ti.com>, Steven Rostedt <rostedt@goodmis.org>,
Stable RT List <stable-rt@vger.kernel.org>,
Praneeth Bajjuri <praneeth@ti.com>
Subject: Re: Question about the maintenance of OOT RT patches for LTS releases (v12.x and v18.x)
Date: Fri, 21 Aug 2026 08:24:56 +0200 [thread overview]
Message-ID: <20260821062456.vqrnjWSh@linutronix.de> (raw)
In-Reply-To: <aoc4Ks-zKZMEcvmx@redhat.com>
On 2026-08-20 14:23:54 [-0300], Luis Claudio R. Goncalves wrote:
> Sebastian, I can merge v6.18.45 into v6.18.37-rt6 too. I can not rebase
> from v6.18.37-rt6 to v6.18.45. But if I repeat the process with
That is expected. That branch has all the patches but also intermediate
patches. The "exact" patches are probably easy to recognize as applied
and dropped as part of the rebase process but the intermediate patches/
commits can result in a clash aborting the process.
So applying the quilt queue should work and merging the stable tag in
either of the two "complete" branches, too. Just don't rebase anything.
> v6.18.37-rt6-rebase, it works fine. In any case, if that is not the
> problem that prompted Bryan's email, no need to focus on that. I was just
> trying to understand the reasoning behind the question and spotted the
> rebase failure.
Okay.
> Best
> Luis
Sebastian
next prev parent reply other threads:[~2026-08-21 6:25 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-06-22 16:11 Question about the maintenance of OOT RT patches for LTS releases (v12.x and v18.x) Luis Claudio R. Goncalves
2026-06-24 6:49 ` Sebastian Andrzej Siewior
2026-06-24 11:14 ` Luis Claudio R. Goncalves
2026-06-25 7:35 ` Alexander Dahl
2026-06-25 8:02 ` Sebastian Andrzej Siewior
2026-08-19 16:30 ` Bryan Brattlof
2026-08-20 14:23 ` Sebastian Andrzej Siewior
2026-08-20 15:57 ` Luis Claudio R. Goncalves
2026-08-20 16:12 ` Sebastian Andrzej Siewior
2026-08-20 17:23 ` Luis Claudio R. Goncalves
2026-08-21 6:24 ` Sebastian Andrzej Siewior [this message]
2026-08-20 19:31 ` Bryan Brattlof
2026-06-25 7:52 ` Sebastian Andrzej Siewior
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=20260821062456.vqrnjWSh@linutronix.de \
--to=bigeasy@linutronix.de \
--cc=bb@ti.com \
--cc=lgoncalv@redhat.com \
--cc=praneeth@ti.com \
--cc=rostedt@goodmis.org \
--cc=stable-rt@vger.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.