Skip to content

Commit

Permalink
Merge tag 'email' of git://git.kernel.org/pub/scm/linux/kernel/git/je…
Browse files Browse the repository at this point in the history
…jb/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
  • Loading branch information
torvalds committed Apr 20, 2024
2 parents 8177722 + 366c5ce commit 39316e5
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions MAINTAINERS
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 39316e5

Please sign in to comment.