Re: linux-next: manual merge of the v4l-dvb tree with the mvebu tree

[Sakari Ailus]

On Thu, Dec 03, 2020 at 11:51:37AM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the v4l-dvb tree got a conflict in:
> 
>   MAINTAINERS
> 
> between commit:
> 
>   8c4e256e3d42 ("MAINTAINERS: Add an entry for MikroTik CRS3xx 98DX3236 boards")
> 
> from the mvebu tree and commit:
> 
>   b24cc2a18c50 ("media: smiapp: Rename as "ccs"")
> 
> from the v4l-dvb 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.

Thanks, Stephen.

The resolution below seems good to me.

-- 
Sakari Ailus