From: Jarkko Sakkinen Date: Thu, 15 Oct 2020 14:26:37 +0000 Subject: [PATCH v2] MAINTAINERS: jarkko.sakkinen@linux.intel.com -> jarkko@kernel.org Message-Id: <20201015142710.8371-1-jarkko.sakkinen@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit List-Id: To: linux-kernel@vger.kernel.org Cc: linux-sgx@vger.kernel.org, keyrings@vger.kernel.org, linux-integrity@vger.kernel.org, Joe Perches , Jarkko Sakkinen , Jonathan Corbet , Andrew Morton , Kees Cook , Mauro Carvalho Chehab , "David S. Miller" , Rob Herring 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 --- v2: * Update the .mailmap (suggested by Joe Perches). https://lore.kernel.org/lkml/b1ccdfbb3119528490ea10f40e1da084b1b23f87.camel@perches.com/ .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 Jan Glauber Jan Glauber Jan Glauber +Jarkko Sakkinen Jason Gunthorpe Jason Gunthorpe Jason Gunthorpe 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 -M: Jarkko Sakkinen +M: Jarkko Sakkinen M: Mimi Zohar L: linux-integrity@vger.kernel.org L: keyrings@vger.kernel.org @@ -9680,7 +9680,7 @@ F: security/keys/trusted-keys/ KEYS/KEYRINGS M: David Howells -M: Jarkko Sakkinen +M: Jarkko Sakkinen L: keyrings@vger.kernel.org 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 -M: Jarkko Sakkinen +M: Jarkko Sakkinen R: Jason Gunthorpe L: linux-integrity@vger.kernel.org S: Maintained -- 2.25.1