aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJarkko Sakkinen <[email protected]>2020-10-15 20:10:41 -0700
committerLinus Torvalds <[email protected]>2020-10-16 11:11:19 -0700
commit32dd8afae7db4d58612338a0bdc0974450e66382 (patch)
tree08902c6a14dcd9ab1664c72c0c1a5918003ac587
parent6343f6b71f83af8ebfc6f9740d1d74f2db88e6b0 (diff)
Use @kernel.org address as the main communications end point. Update the corresponding M-entries and .mailmap (for git shortlog translation). Signed-off-by: Jarkko Sakkinen <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Cc: Joe Perches <[email protected]> Cc: Jonathan Corbet <[email protected]> Cc: Kees Cook <[email protected]> Cc: Mauro Carvalho Chehab <[email protected]> Cc: "David S. Miller" <[email protected]> Cc: Rob Herring <[email protected]> Link: https://lkml.kernel.org/r/[email protected] Signed-off-by: Linus Torvalds <[email protected]>
-rw-r--r--.mailmap1
-rw-r--r--MAINTAINERS6
2 files changed, 4 insertions, 3 deletions
diff --git a/.mailmap b/.mailmap
index e4ccac4e2f88..1e14566a3d56 100644
--- a/.mailmap
+++ b/.mailmap
@@ -133,6 +133,7 @@ James Ketrenos <jketreno@io.(none)>
diff --git a/MAINTAINERS b/MAINTAINERS
index 48b0333d19e2..c925fd3c5c3f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9701,7 +9701,7 @@ F: security/keys/encrypted-keys/
KEYS-TRUSTED
M: James Bottomley <[email protected]>
-M: Jarkko Sakkinen <[email protected]>
+M: Jarkko Sakkinen <[email protected]>
M: Mimi Zohar <[email protected]>
@@ -9713,7 +9713,7 @@ F: security/keys/trusted-keys/
KEYS/KEYRINGS
M: David Howells <[email protected]>
-M: Jarkko Sakkinen <[email protected]>
+M: Jarkko Sakkinen <[email protected]>
S: Maintained
F: Documentation/security/keys/core.rst
@@ -17684,7 +17684,7 @@ F: drivers/platform/x86/toshiba-wmi.c
TPM DEVICE DRIVER
M: Peter Huewe <[email protected]>
-M: Jarkko Sakkinen <[email protected]>
+M: Jarkko Sakkinen <[email protected]>
R: Jason Gunthorpe <[email protected]>
S: Maintained