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 <jarkko.sakkinen@xxxxxxxxxxxxxxx> --- v2: * Update the .mailmap (suggested by Joe Perches). https://lore.kernel.org/lkml/b1ccdfbb3119528490ea10f40e1da084b1b23f87.camel@xxxxxxxxxxx/ .mailmap | 1 + MAINTAINERS | 6 +++--- 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)> Jan Glauber <jan.glauber@xxxxxxxxx> <jang@xxxxxxxxxx> Jan Glauber <jan.glauber@xxxxxxxxx> <jang@xxxxxxxxxxxxxxxxxx> Jan Glauber <jan.glauber@xxxxxxxxx> <jglauber@xxxxxxxxxx> +Jarkko Sakkinen <jarkko@xxxxxxxxxx> <jarkko.sakkinen@xxxxxxxxxxxxxxx> Jason Gunthorpe <jgg@xxxxxxxx> <jgg@xxxxxxxxxxxx> Jason Gunthorpe <jgg@xxxxxxxx> <jgg@xxxxxxxxxx> Jason Gunthorpe <jgg@xxxxxxxx> <jgunthorpe@xxxxxxxxxxxxxxxxxxxx> diff --git a/MAINTAINERS b/MAINTAINERS index 6594f0966716..afe2a20fb85a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9668,7 +9668,7 @@ F: security/keys/encrypted-keys/ KEYS-TRUSTED M: James Bottomley <jejb@xxxxxxxxxxxxx> -M: Jarkko Sakkinen <jarkko.sakkinen@xxxxxxxxxxxxxxx> +M: Jarkko Sakkinen <jarkko@xxxxxxxxxx> M: Mimi Zohar <zohar@xxxxxxxxxxxxx> L: linux-integrity@xxxxxxxxxxxxxxx L: keyrings@xxxxxxxxxxxxxxx @@ -9680,7 +9680,7 @@ F: security/keys/trusted-keys/ KEYS/KEYRINGS M: David Howells <dhowells@xxxxxxxxxx> -M: Jarkko Sakkinen <jarkko.sakkinen@xxxxxxxxxxxxxxx> +M: Jarkko Sakkinen <jarkko@xxxxxxxxxx> L: keyrings@xxxxxxxxxxxxxxx S: Maintained F: Documentation/security/keys/core.rst @@ -17616,7 +17616,7 @@ F: drivers/platform/x86/toshiba-wmi.c TPM DEVICE DRIVER M: Peter Huewe <peterhuewe@xxxxxx> -M: Jarkko Sakkinen <jarkko.sakkinen@xxxxxxxxxxxxxxx> +M: Jarkko Sakkinen <jarkko@xxxxxxxxxx> R: Jason Gunthorpe <jgg@xxxxxxxx> L: linux-integrity@xxxxxxxxxxxxxxx S: Maintained -- 2.25.1
