Re: linux-next: manual merge of the vhost tree with the char-misc tree

[Greg Kroah-Hartman <gregkh@linuxfoundation.org>]

On Mon, Jul 15, 2024 at 03:40:45PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the vhost tree got a conflict in:
> 
>   MAINTAINERS
> 
> between commit:
> 
>   5f67eef6dff3 ("misc: mrvl-cn10k-dpi: add Octeon CN10K DPI administrative driver")
> 
> from the char-misc tree and commit:
> 
>   8b6c724cdab8 ("virtio: vdpa: vDPA driver for Marvell OCTEON DPU devices")
> 
> from the vhost 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.
> 
> -- 
> Cheers,
> Stephen Rothwell
> 
> diff --cc MAINTAINERS
> index eb7433a8ce3d,8eefd032c87e..000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -13642,11 -13459,11 +13642,16 @@@ S:	Supporte
>   F:	Documentation/devicetree/bindings/mmc/marvell,xenon-sdhci.yaml
>   F:	drivers/mmc/host/sdhci-xenon*
>   
>  +MARVELL OCTEON CN10K DPI DRIVER
>  +M:	Vamsi Attunuru <vattunuru@marvell.com>
>  +S:	Supported
>  +F:	drivers/misc/mrvl_cn10k_dpi.c
>  +
> + MARVELL OCTEON ENDPOINT VIRTIO DATA PATH ACCELERATOR
> + R:	schalla@marvell.com
> + R:	vattunuru@marvell.com
> + F:	drivers/vdpa/octeon_ep/
> + 
>   MATROX FRAMEBUFFER DRIVER
>   L:	linux-fbdev@vger.kernel.org
>   S:	Orphan



Looks good, thanks!

greg k-h