Hi all,
Today's linux-next merge of the vfio tree got a conflict in:
MAINTAINERS
between commit:
27103dddc2da ("Documentation: update mailing list addresses")
from the jc_docs tree and commit:
05f3a0bd094c ("MAINTAINERS: Re-alphabetize VFIO")
from the vfio 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 818041f70659,7625911ec2f1..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -23241,6 -23118,13 +23240,13 @@@ L: kvm@xxxxxxxxxxxxxx
S: Maintained
F: drivers/vfio/platform/
+ VFIO VIRTIO PCI DRIVER
+ M: Yishai Hadas <yishaih@xxxxxxxxxx>
+ L: kvm@xxxxxxxxxxxxxxx
-L: virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx
++L: virtualization@xxxxxxxxxxxxxxx
+ S: Maintained
+ F: drivers/vfio/pci/virtio
+
VGA_SWITCHEROO
R: Lukas Wunner <lukas@xxxxxxxxx>
S: Maintained
Attachment:
pgpVO5pMUzLl3.pgp
Description: OpenPGP digital signature
