diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-10-21 12:33:29 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-10-21 12:33:29 -1000 |
| commit | 552c50713f273b494ac6c77052032a49bc9255e2 (patch) | |
| tree | c9c6a2781397798836c8e3031a2ba2e3631dc1a2 | |
| parent | 6548d364a3e850326831799d7e3ea2d7bb97ba08 (diff) | |
| parent | b2c37c1168f537900158c860174001d055d8d583 (diff) | |
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
| -rw-r--r-- | .mailmap | 1 | ||||
| -rw-r--r-- | MAINTAINERS | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -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> diff --git a/MAINTAINERS b/MAINTAINERS index 545a4776795e..74389eddb954 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 |