Re: linux-next: manual merge of the mm-nonmm-unstable tree with the mm tree

[Mark Brown]

On Tue, Sep 15, 2026 at 08:23:27PM +0200, David Hildenbrand (Arm) wrote:

> I think the problem is that

> akpm/mm-nonmm-unstable

> is based on

> akpm/mm-hotfixes-unstable (and akpm/mm-hotfixes-stable)

> Which only go into the MM-next tree.

> So if a commit in akpm/mm-hotfixes-unstable changes (and a stale one is in
> mm/for-next-fixes), it comes it through two trees in different forms.

Yes, rebasing a branch that's being merged elsewhere is going to cause
issues like this.

> Likely we'd need a separate akpm branch for NON-MM hotfixes ... or I'll take
> care of all MM hotfixes through the mm/core tree.

Either of those should work well, I can easily add an extra nonmm
hotfixes branch - let me know if that's what you decide to do.

Attachment: signature.asc
Description: PGP signature