Re: Question about the maintenance of OOT RT patches for LTS releases (v12.x and v18.x)

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