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

[Mark Brown]

On Mon, Nov 02, 2026 at 11:02:14AM -0800, Andrew Morton wrote:
> On Mon, 2 Nov 2026 14:19:41 +0000 Mark Brown <broonie@xxxxxxxxxx> wrote:

> > 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.

> > 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.

I wouldn't worry about it - the actual conflict is trivial, the diff
looks much larger than the actual conflict was due to it being diff -c
and MAINTAINERS being quite busy.  Just plain diff is empty due to the
delete/delete.

Attachment: signature.asc
Description: PGP signature