summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2024-04-20 11:17:22 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2024-04-20 11:17:22 -0700
commit39316e5fa94157ac1eb481c762d1e688b2f08138 (patch)
treefef486446f2055e83ba7d33b3b15dae0e8810a2b /MAINTAINERS
parent817772266d10f2700c9eef41a0fb5b5a9f30fdfd (diff)
parent366c5cec9ce473f68925d703a07cac56e1d16956 (diff)
downloadlinux-stable-39316e5fa94157ac1eb481c762d1e688b2f08138.tar.gz
linux-stable-39316e5fa94157ac1eb481c762d1e688b2f08138.tar.bz2
linux-stable-39316e5fa94157ac1eb481c762d1e688b2f08138.zip
Merge tag 'email' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull email address update from James Bottomley: "My IBM email has stopped working, so update to a working email address" * tag 'email' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: MAINTAINERS: update to working email address
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS4
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index ee9cc2b40409..261023998c5b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11995,7 +11995,7 @@ F: include/keys/encrypted-type.h
F: security/keys/encrypted-keys/
KEYS-TRUSTED
-M: James Bottomley <jejb@linux.ibm.com>
+M: James Bottomley <James.Bottomley@HansenPartnership.com>
M: Jarkko Sakkinen <jarkko@kernel.org>
M: Mimi Zohar <zohar@linux.ibm.com>
L: linux-integrity@vger.kernel.org
@@ -19669,7 +19669,7 @@ F: drivers/scsi/sg.c
F: include/scsi/sg.h
SCSI SUBSYSTEM
-M: "James E.J. Bottomley" <jejb@linux.ibm.com>
+M: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
M: "Martin K. Petersen" <martin.petersen@oracle.com>
L: linux-scsi@vger.kernel.org
S: Maintained