Commit 552c5071 authored Oct 21, 2025 by Linus Torvalds

Merge tag 'vfio-v6.18-rc3' of https://github.com/awilliam/linux-vfio

Pull VFIO fixlet from Alex Williamson:
 "A tiny update as I'm changing jobs. Different email, same signing key
  for now.

   - Update VFIO maintainers entry (Alex Williamson)"

* tag 'vfio-v6.18-rc3' of https://github.com/awilliam/linux-vfio:
  MAINTAINERS: Update Alex Williamson's email address

parents 6548d364 b2c37c11

.mailmap

+1 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ Alan Cox <alan@lxorguk.ukuu.org.uk>
		Alan Cox <root@hraefn.swansea.linux.org.uk>
		Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
		Aleksey Gorelov <aleksey_gorelov@phoenix.com>
		Alex Williamson <alex@shazbot.org> <alex.williamson@redhat.com>
		Alexander Lobakin <alobakin@pm.me> <alobakin@dlink.ru>
		Alexander Lobakin <alobakin@pm.me> <alobakin@marvell.com>
		Alexander Lobakin <alobakin@pm.me> <bloodyreaper@yandex.ru>

MAINTAINERS

+2 −2

Original line number	Diff line number	Diff line
		@@ -26885,7 +26885,7 @@ S: Maintained
		F: drivers/vfio/cdx/*

		VFIO DRIVER
		M: Alex Williamson <alex.williamson@redhat.com>
		M: Alex Williamson <alex@shazbot.org>
		L: kvm@vger.kernel.org
		S: Maintained
		T: git https://github.com/awilliam/linux-vfio.git
		@@ -27048,7 +27048,7 @@ T: git git://linuxtv.org/media.git
		F: drivers/media/test-drivers/vimc/*

		VIRT LIB
		M: Alex Williamson <alex.williamson@redhat.com>
		M: Alex Williamson <alex@shazbot.org>
		M: Paolo Bonzini <pbonzini@redhat.com>
		L: kvm@vger.kernel.org
		S: Supported