+ maintainers-switch-to-kernelorg-email-address-for-javi-merino.patch added to -mm tree

+ maintainers-switch-to-kernelorg-email-address-for-javi-merino.patch added to -mm tree

[akpm]

The patch titled
     Subject: MAINTAINERS: Javi has moved
has been added to the -mm tree.  Its filename is
     maintainers-switch-to-kernelorg-email-address-for-javi-merino.patch

This patch should soon appear at
    http://ozlabs.org/~akpm/mmots/broken-out/maintainers-switch-to-kernelorg-email-address-for-javi-merino.patch
and later at
    http://ozlabs.org/~akpm/mmotm/broken-out/maintainers-switch-to-kernelorg-email-address-for-javi-merino.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/SubmitChecklist when testing your code ***

The -mm tree is included into linux-next and is updated
there every 3-4 working days

------------------------------------------------------
From: Javi Merino <javi.merino@arm.com>
Subject: MAINTAINERS: Javi has moved

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

Link: http://lkml.kernel.org/r/1475237668-8408-1-git-send-email-javi.merino@arm.com
Signed-off-by: Javi Merino <javi.merino@arm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 .mailmap    |    1 +
 MAINTAINERS |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff -puN .mailmap~maintainers-switch-to-kernelorg-email-address-for-javi-merino .mailmap
--- a/.mailmap~maintainers-switch-to-kernelorg-email-address-for-javi-merino
+++ a/.mailmap
@@ -69,6 +69,7 @@ James Bottomley <jejb@mulgrave.(none)>
 James Bottomley <jejb@titanic.il.steeleye.com>
 James E Wilson <wilson@specifix.com>
 James Ketrenos <jketreno@io.(none)>
+Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
 <javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
 Jean Tourrilhes <jt@hpl.hp.com>
 Jeff Garzik <jgarzik@pretzel.yyz.us>
diff -puN MAINTAINERS~maintainers-switch-to-kernelorg-email-address-for-javi-merino MAINTAINERS
--- a/MAINTAINERS~maintainers-switch-to-kernelorg-email-address-for-javi-merino
+++ a/MAINTAINERS
@@ -11626,7 +11626,7 @@ F:	Documentation/devicetree/bindings/the
 THERMAL/CPU_COOLING
 M:	Amit Daniel Kachhap <amit.kachhap@gmail.com>
 M:	Viresh Kumar <viresh.kumar@linaro.org>
-M:	Javi Merino <javi.merino@arm.com>
+M:	Javi Merino <javi.merino@kernel.org>
 L:	linux-pm@vger.kernel.org
 S:	Supported
 F:	Documentation/thermal/cpu-cooling-api.txt
_

Patches currently in -mm which might be from javi.merino@arm.com are

maintainers-switch-to-kernelorg-email-address-for-javi-merino.patch