* linux-next: manual merge of the vhost tree with the char-misc tree
@ 2024-07-15 5:40 Stephen Rothwell
2024-07-15 7:00 ` Greg Kroah-Hartman
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2024-07-15 5:40 UTC (permalink / raw)
To: Michael S. Tsirkin, Greg Kroah-Hartman
Cc: Linux Kernel Mailing List, Linux Next Mailing List,
Nithin Dabilpuram, Shijith Thotton, Srujana Challa,
Vamsi Attunuru
[-- Attachment #1: Type: text/plain, Size: 1376 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the vhost tree with the char-misc tree
2024-07-15 5:40 linux-next: manual merge of the vhost tree with the char-misc tree Stephen Rothwell
@ 2024-07-15 7:00 ` Greg Kroah-Hartman
0 siblings, 0 replies; 2+ messages in thread
From: Greg Kroah-Hartman @ 2024-07-15 7:00 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Michael S. Tsirkin, Linux Kernel Mailing List,
Linux Next Mailing List, Nithin Dabilpuram, Shijith Thotton,
Srujana Challa, Vamsi Attunuru
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-07-15 7:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-15 5:40 linux-next: manual merge of the vhost tree with the char-misc tree Stephen Rothwell
2024-07-15 7:00 ` Greg Kroah-Hartman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox