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

Mark Brown
2026-04-07T10:54:08Z

[-- Attachment #1: Type: text/plain, Size: 466 bytes --]

On Tue, Apr 07, 2026 at 10:19:59AM +0800, Joseph Qi wrote:
> On 4/7/26 12:25 AM, Andrew Morton wrote:

> > Thanks. That's a nasty-looking conflict due to the applying order. The
> > 0b2600f81cefc change is actually small, below.

> > Hopefully Linus can figure it out ;)

> Should I resend the series base on the latest linux-next?

Definitely don't do that, things sent to Linus should be based on his
tree only - basing on -next will pull in far too much stuff.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]