linux-kernel - [PATCH] MAINTAINERS: Switch to kernel.org email address for Javi Merino

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:   Fri, 30 Sep 2016 13:14:28 +0100
From:   Javi Merino <javi.merino@....com>
To:     Linus Torvalds <torvalds@...ux-foundation.org>,
        Andrew Morton <akpm@...ux-foundation.org>
Cc:     linux-kernel@...r.kernel.org, linux-pm@...r.kernel.org,
        Zhang Rui <rui.zhang@...el.com>,
        Eduardo Valentin <edubezval@...il.com>, javi.merino@...nel.org,
        Javi Merino <javi.merino@....com>
Subject: [PATCH] MAINTAINERS: Switch to kernel.org email address for Javi Merino

Change my email address to my kernel.org account instead of the ARM one.

Signed-off-by: Javi Merino <javi.merino@....com>
---
 .mailmap    | 1 +
 MAINTAINERS | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index de22daefd9da..1dab0a156489 100644
--- a/.mailmap
+++ b/.mailmap
@@ -69,6 +69,7 @@ James Bottomley <jejb@...grave.(none)>
 James Bottomley <jejb@...anic.il.steeleye.com>
 James E Wilson <wilson@...cifix.com>
 James Ketrenos <jketreno@io.(none)>
+Javi Merino <javi.merino@...nel.org> <javi.merino@....com>
 <javier@....samsung.com> <javier.martinez@...labora.co.uk>
 Jean Tourrilhes <jt@....hp.com>
 Jeff Garzik <jgarzik@...tzel.yyz.us>
diff --git a/MAINTAINERS b/MAINTAINERS
index b003d0ca6238..f593300e310b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -11626,7 +11626,7 @@ F:	Documentation/devicetree/bindings/thermal/
 THERMAL/CPU_COOLING
 M:	Amit Daniel Kachhap <amit.kachhap@...il.com>
 M:	Viresh Kumar <viresh.kumar@...aro.org>
-M:	Javi Merino <javi.merino@....com>
+M:	Javi Merino <javi.merino@...nel.org>
 L:	linux-pm@...r.kernel.org
 S:	Supported
 F:	Documentation/thermal/cpu-cooling-api.txt
-- 
1.9.1