On Mon, Feb 13, 2023 at 01:13:18PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> MAINTAINERS
>
> between commit:
>
> ba47652ba655 ("media: meye: remove this deprecated driver")
>
> from the v4l-dvb tree and commit:
>
> eec8ccab1b57 ("most: add maintainer entry")
>
> from the staging tree.
>
> 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.
Fix up looks good, thanks!
greg k-h
