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@xxxxxxxxxxxxxxxx
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@xxxxxxxxxx>
+ M: Cornelia Huck <cornelia.huck@xxxxxxxxxx>
+ L: linux-s390@xxxxxxxxxxxxxxx
+ L: virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx
+ L: kvm@xxxxxxxxxxxxxxx
+ S: Supported
+ F: drivers/s390/virtio/
+
+VIRTIO GPU DRIVER
+M: David Airlie <airlied@xxxxxxxx>
+M: Gerd Hoffmann <kraxel@xxxxxxxxxx>
+L: dri-devel@xxxxxxxxxxxxxxxxxxxxx
+L: virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx
+S: Maintained
+F: drivers/gpu/drm/virtio/
+F: include/uapi/linux/virtio_gpu.h
+
VIRTIO HOST (VHOST)
M: "Michael S. Tsirkin" <mst@xxxxxxxxxx>
L: kvm@xxxxxxxxxxxxxxx
Attachment:
pgp5PinBV30mo.pgp
Description: OpenPGP digital signature
