linux-kernel - linux-next: manual merge of the vfio tree with the jc

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20240223140325.345a9cdb@canb.auug.org.au>
Date: Fri, 23 Feb 2024 14:03:25 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Alex Williamson <alex.williamson@...hat.com>, Jonathan Corbet
 <corbet@....net>
Cc: Konstantin Ryabitsev <konstantin@...uxfoundation.org>, Linux Kernel
 Mailing List <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the vfio tree with the jc_docs tree

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@...r.kernel.or
  S:	Maintained
  F:	drivers/vfio/platform/
  
+ VFIO VIRTIO PCI DRIVER
+ M:	Yishai Hadas <yishaih@...dia.com>
+ L:	kvm@...r.kernel.org
 -L:	virtualization@...ts.linux-foundation.org
++L:	virtualization@...ts.linux.dev
+ S:	Maintained
+ F:	drivers/vfio/pci/virtio
+ 
  VGA_SWITCHEROO
  R:	Lukas Wunner <lukas@...ner.de>
  S:	Maintained

Content of type "application/pgp-signature" skipped