From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Michael S. Tsirkin" <mst@redhat•com>,
Greg Kroah-Hartman <gregkh@linuxfoundation•org>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Nithin Dabilpuram <ndabilpuram@marvell•com>,
Shijith Thotton <sthotton@marvell•com>,
Srujana Challa <schalla@marvell•com>,
Vamsi Attunuru <vattunuru@marvell•com>
Subject: linux-next: manual merge of the vhost tree with the char-misc tree
Date: Mon, 15 Jul 2024 15:40:45 +1000 [thread overview]
Message-ID: <20240715154045.0f319b32@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2024-07-15 5:40 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-15 5:40 Stephen Rothwell [this message]
2024-07-15 7:00 ` linux-next: manual merge of the vhost tree with the char-misc tree Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240715154045.0f319b32@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mst@redhat$(echo .)com \
--cc=ndabilpuram@marvell$(echo .)com \
--cc=schalla@marvell$(echo .)com \
--cc=sthotton@marvell$(echo .)com \
--cc=vattunuru@marvell$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox