From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Michael S. Tsirkin" <mst@redhat.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Gerd Hoffmann <kraxel@redhat.com>
Subject: linux-next: manual merge of the vhost tree with Linus' tree
Date: Wed, 8 Jul 2015 11:43:07 +1000 [thread overview]
Message-ID: <20150708114307.3da73865@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1366 bytes --]
Hi Michael,
Today's linux-next merge of the vhost tree got a conflict in:
MAINTAINERS
between commit:
4ad6ee91aa9f ("Add MAINTAINERS entry for virtio-gpu")
from Linus' tree and commit:
f2dbda3b4fc2 ("MAINTAINERS: separate section for s390 virtio drivers")
from the vhost tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc MAINTAINERS
index d558d280fdc1,fbef7d0a4dd5..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -10895,15 -10570,15 +10894,24 @@@ F: drivers/block/virtio_blk.
F: include/linux/virtio_*.h
F: include/uapi/linux/virtio_*.h
+ VIRTIO DRIVERS FOR S390
+ M: Christian Borntraeger <borntraeger@de.ibm.com>
+ M: Cornelia Huck <cornelia.huck@de.ibm.com>
+ L: linux-s390@vger.kernel.org
+ L: virtualization@lists.linux-foundation.org
+ L: kvm@vger.kernel.org
+ S: Supported
+ F: drivers/s390/virtio/
+
+VIRTIO GPU DRIVER
+M: David Airlie <airlied@linux.ie>
+M: Gerd Hoffmann <kraxel@redhat.com>
+L: dri-devel@lists.freedesktop.org
+L: virtualization@lists.linux-foundation.org
+S: Maintained
+F: drivers/gpu/drm/virtio/
+F: include/uapi/linux/virtio_gpu.h
+
VIRTIO HOST (VHOST)
M: "Michael S. Tsirkin" <mst@redhat.com>
L: kvm@vger.kernel.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-07-08 1:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-08 1:43 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-12-19 23:05 linux-next: manual merge of the vhost tree with Linus' tree Stephen Rothwell
2021-09-06 2:28 Stephen Rothwell
2021-09-06 2:56 ` Yongji Xie
2019-12-04 3:00 Stephen Rothwell
2019-12-09 0:40 ` Stephen Rothwell
2019-01-03 1:39 Stephen Rothwell
2015-07-24 3:59 Stephen Rothwell
2013-05-09 2:04 Stephen Rothwell
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=20150708114307.3da73865@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=kraxel@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mst@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).