summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorMartin K. Petersen <martin.petersen@oracle.com>2021-04-06 05:57:29 +0300
committerMartin K. Petersen <martin.petersen@oracle.com>2021-04-06 05:57:29 +0300
commit556666bce111b2a758010c2a2a6bab7f3770f4de (patch)
tree3a35ea6f9a9aa43b82166afc1f329084dd55c729 /MAINTAINERS
parent4e2e619f3c9e3c49859f085995554a53e9fc0e02 (diff)
parent9e67600ed6b8565da4b85698ec659b5879a6c1c6 (diff)
downloadlinux-556666bce111b2a758010c2a2a6bab7f3770f4de.tar.xz
Merge branch '5.12/scsi-fixes' into 5.13/scsi-staging
Pull 5.12/scsi-fixes into the 5.13 SCSI tree to provide a baseline for some UFS changes that would otherwise cause conflicts during the merge. Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index d92f85ca831d..dede3b947834 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -19165,7 +19165,7 @@ S: Maintained
F: drivers/infiniband/hw/vmw_pvrdma/
VMware PVSCSI driver
-M: Jim Gill <jgill@vmware.com>
+M: Vishal Bhakta <vbhakta@vmware.com>
M: VMware PV-Drivers <pv-drivers@vmware.com>
L: linux-scsi@vger.kernel.org
S: Maintained