Re: linux-next: manual merge of the block tree with the dma-mapping tree

[Christoph Hellwig]

On Fri, Oct 16, 2026 at 01:18:07PM +0100, Mark Brown wrote:
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

Yeah, basically take the block tree version and do the rename in the
dma-mapping tree.  This is probably easier to merge at this "intent"
level than down on the per-line level.