Merge tag 'v5.2-rc2-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 0c55b0fedbe292a26f2d2095faa716deb6677913..fac3f405e7c0da6148ced099b419294ba7d329ca 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2627,7 +2627,7 @@ F:        Documentation/devicetree/bindings/eeprom/at24.txt
 F:     drivers/misc/eeprom/at24.c
 
 ATA OVER ETHERNET (AOE) DRIVER
-M:     "Ed L. Cashin" <ed.cashin@acm.org>
+M:     "Justin Sanders" <justin@coraid.com>
 W:     http://www.openaoe.org/
 S:     Supported
 F:     Documentation/aoe/
@@ -2768,7 +2768,7 @@ AVIA HX711 ANALOG DIGITAL CONVERTER IIO DRIVER
 M:     Andreas Klinger <ak@it-klinger.de>
 L:     linux-iio@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/iio/adc/avia-hx711.txt
+F:     Documentation/devicetree/bindings/iio/adc/avia-hx711.yaml
 F:     drivers/iio/adc/hx711.c
 
 AX.25 NETWORK LAYER
@@ -3049,8 +3049,9 @@ S:        Maintained
 F:     arch/riscv/net/
 
 BPF JIT for S390
-M:     Martin Schwidefsky <schwidefsky@de.ibm.com>
 M:     Heiko Carstens <heiko.carstens@de.ibm.com>
+M:     Vasily Gorbik <gor@linux.ibm.com>
+M:     Christian Borntraeger <borntraeger@de.ibm.com>
 L:     netdev@vger.kernel.org
 L:     bpf@vger.kernel.org
 S:     Maintained
@@ -8611,14 +8612,12 @@ F:      arch/x86/include/asm/svm.h
 F:     arch/x86/kvm/svm.c
 
 KERNEL VIRTUAL MACHINE FOR ARM/ARM64 (KVM/arm, KVM/arm64)
-M:     Christoffer Dall <christoffer.dall@arm.com>
 M:     Marc Zyngier <marc.zyngier@arm.com>
 R:     James Morse <james.morse@arm.com>
 R:     Julien Thierry <julien.thierry@arm.com>
 R:     Suzuki K Pouloze <suzuki.poulose@arm.com>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 L:     kvmarm@lists.cs.columbia.edu
-W:     http://systems.cs.columbia.edu/projects/kvm-arm
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git
 S:     Maintained
 F:     arch/arm/include/uapi/asm/kvm*
@@ -11226,7 +11225,7 @@ F:      drivers/video/fbdev/riva/
 F:     drivers/video/fbdev/nvidia/
 
 NVM EXPRESS DRIVER
-M:     Keith Busch <keith.busch@intel.com>
+M:     Keith Busch <kbusch@kernel.org>
 M:     Jens Axboe <axboe@fb.com>
 M:     Christoph Hellwig <hch@lst.de>
 M:     Sagi Grimberg <sagi@grimberg.me>
@@ -13616,8 +13615,9 @@ S:      Maintained
 F:     drivers/video/fbdev/savage/
 
 S390
-M:     Martin Schwidefsky <schwidefsky@de.ibm.com>
 M:     Heiko Carstens <heiko.carstens@de.ibm.com>
+M:     Vasily Gorbik <gor@linux.ibm.com>
+M:     Christian Borntraeger <borntraeger@de.ibm.com>
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git
@@ -14351,7 +14351,7 @@ SIMPLEFB FB DRIVER
 M:     Hans de Goede <hdegoede@redhat.com>
 L:     linux-fbdev@vger.kernel.org
 S:     Maintained
-F:     Documentation/devicetree/bindings/display/simple-framebuffer.txt
+F:     Documentation/devicetree/bindings/display/simple-framebuffer.yaml
 F:     drivers/video/fbdev/simplefb.c
 F:     include/linux/platform_data/simplefb.h