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

[Mark Brown]

On Mon, Oct 19, 2026 at 07:48:05AM -0400, Sasha Levin wrote:
> On Mon, Sep 28, 2026 at 01:48:14PM +0100, Mark Brown wrote:
> > There is a fixup in -next already which is hopefully OK, I don't recall
> > it being especially bad so probably Linus would be OK with resolving it.
> 
> Hi Mark,
> 
> The fixup in -next takes the mm side of xfs_btree_split_worker()
> verbatim, which puts xfs_trans_set_context()/xfs_trans_clear_context()
> back and drops

Thanks for these.

If you have fixups for merges in -next it's much easier if you can send
an incremental fixup against the merge rather than a completely fresh
merge, the tooling uses a rerere cache so unless there's a new conflict
in the same place it's hard to get back to the original conflict.

Attachment: signature.asc
Description: PGP signature