Re: linux-next: manual merge of the staging.current tree with the mm-fixes tree

[Andrew Morton]

On Mon, 2 Nov 2026 14:19:41 +0000 Mark Brown <broonie@xxxxxxxxxx> wrote:

> Today's linux-next merge of the staging.current tree got a conflict in:
> 
>   MAINTAINERS
> 
> between commit:
> 
>   88c41b4cb3432 ("MAINTAINERS: sort component entries alphabetically")
> 
> from the mm-fixes tree and commit:
> 
>   24934cb6b8cd9 ("staging: vme_user: delete driver")
> 
> from the staging.current tree, the rare delete/delete conflict.
> 
> 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.
> 
> diff --combined MAINTAINERS

OK, thanks, that's nuts.  I'll make those two patches go away for now. 
It's not exactly important stuff - think about it later.