[PATCH 2/2] .mailmap: Run mailmapper and sync name locations

[Michal Simek]

The patch is output from
scripts/mailmapper > tmp; mv tmp .mailmap
with moving <swarren at wwwdotorg.org> and <swarren at wwwdotorg.org> to the same
block with "This contributor prefers not to receive mails" description.

Signed-off-by: Michal Simek <michal.simek at amd.com>
---

 .mailmap | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.mailmap b/.mailmap
index d9ba6638728b..81883490934b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -15,6 +15,7 @@
 # Proper Name <proper at email.xx> <commit at email.xx>
 # Proper Name <proper at email.xx> Commit Name <commit at email.xx>
 
+<duje at dujemihanovic.xyz> <duje.mihanovic at skole.hr>
 AKASHI Takahiro <akashi.tkhro at gmail.com> <takahiro.akashi at linaro.org>
 Abbarapu Venkatesh Yadav <venkyada at qti.qualcomm.com> Venkatesh Yadav Abbarapu <venkatesh.abbarapu at amd.com>
 Alexander Graf <agraf at csgraf.de> <agraf at suse.de>
@@ -42,21 +43,20 @@ Chen-Yu Tsai <wens at kernel.org> <wens at csie.org>
 Christian Kohn <chris.kohn at amd.com> <christian.kohn at xilinx.com>
 Christopher Obbard <christopher.obbard at linaro.org> <chris.obbard at collabora.com>
 Dirk Behme <dirk.behme at googlemail.com>
-<duje at dujemihanovic.xyz> <duje.mihanovic at skole.hr>
 Durga Challa <durga.challa at amd.com> <vnsl.durga.challa at xilinx.com>
-Eugen Hristev <ehristev at kernel.org> <eugen.hristev at microchip.com>
-Eugen Hristev <ehristev at kernel.org> <eugen.hristev at linaro.org>
 Eugen Hristev <ehristev at kernel.org> <eugen.hristev at collabora.com>
+Eugen Hristev <ehristev at kernel.org> <eugen.hristev at linaro.org>
+Eugen Hristev <ehristev at kernel.org> <eugen.hristev at microchip.com>
 Fabio Estevam <fabio.estevam at nxp.com>
 Greg Malysa <malysagreg at gmail.com> <greg.malysa at timesys.com>
 Harini Katakam <harini.katakam at amd.com> <harini.katakam at xilinx.com>
 Harsha <harsha.harsha at amd.com> <harsha.harsha at xilinx.com>
-Heiko Stuebner <heiko.stuebner at cherry.de> <heiko.stuebner at theobroma-systems.com>
-Heiko Schocher <hs at nabladev.com> <hs at denx.de>
-Heiko Schocher <hs at nabladev.com> <hs at pollux.denx.de>
-Heiko Schocher <hs at nabladev.com> <heiko.schocher at invitel.hu>
 Heiko Schocher <hs at nabladev.com> <[hs at denx.de]>
+Heiko Schocher <hs at nabladev.com> <heiko.schocher at invitel.hu>
+Heiko Schocher <hs at nabladev.com> <hs at denx.de>
 Heiko Schocher <hs at nabladev.com> <hs at pollux.(none)>
+Heiko Schocher <hs at nabladev.com> <hs at pollux.denx.de>
+Heiko Stuebner <heiko.stuebner at cherry.de> <heiko.stuebner at theobroma-systems.com>
 Heinrich Schuchardt <xypron.glpk at gmx.de> <heinrich.schuchardt at canonical.com>
 Heinrich Schuchardt <xypron.glpk at gmx.de> xypron.glpk at gmx.de <xypron.glpk at gmx.de>
 Ibai Erkiaga <ibai.erkiaga-elorza at amd.com> <ibai.erkiaga-elorza at xilinx.com>
@@ -72,14 +72,13 @@ Jakob Unterwurzacher <jakob.unterwurzacher at cherry.de> <jakob.unterwurzacher at theo
 Javier Tia <floss at jetm.me> <javier.tia at linaro.org>
 Jay Buddhabhatti <jay.buddhabhatti at amd.com> <jay.buddhabhatti at xilinx.com>
 Jernej Skrabec <jernej.skrabec at gmail.com> <jernej.skrabec at siol.net>
-Jerome Forissier <jerome.forissier at arm.com> <jerome at forissier.org>
 Jerome Forissier <jerome.forissier at arm.com> <jerome.forissier at linaro.org>
+Jerome Forissier <jerome.forissier at arm.com> <jerome at forissier.org>
 John Linn <john.linn at amd.com> <john.linn at xilinx.com>
 Jyotheeswar Reddy Mutthareddyvari <jyotheeswar.reddy.mutthareddyvari at amd.com> <jyothee at xilinx.com>
 Jyotheeswar Reddy Mutthareddyvari <jyotheeswar.reddy.mutthareddyvari at amd.com> <jyotheeswar.reddy.mutthareddyvari at xilinx.com>
 Kalyani Akula <kalyani.akula at amd.com> <kalyani.akula at xilinx.com>
 Klaus Goger <klaus.goger at cherry.de> <klaus.goger at theobroma-systems.com>
-Masahisa Kojima <kojima.masahisa at socionext.com> <masahisa.kojima at linaro.org>
 Linus Walleij <linusw at kernel.org> <linus.walleij at linaro.org>
 Love Kumar <love.kumar at amd.com> <love.kumar at xilinx.com>
 Lukasz Majewski <lukma at denx.de>
@@ -89,8 +88,9 @@ Marek Vasut <marex at denx.de> <marek.vasut+renesas at gmail.com>
 Marek Vasut <marex at denx.de> <marek.vasut at gmail.com>
 Marek Vasut <marex at denx.de> <marex at denx.de>
 Markus Klotzbuecher <mk at denx.de>
-Masahiro Yamada <masahiroy at kernel.org> <yamada.masahiro at socionext.com>
 Masahiro Yamada <masahiroy at kernel.org> <yamada.m at jp.panasonic.com>
+Masahiro Yamada <masahiroy at kernel.org> <yamada.masahiro at socionext.com>
+Masahisa Kojima <kojima.masahisa at socionext.com> <masahisa.kojima at linaro.org>
 Mattijs Korpershoek <mkorpershoek at kernel.org> <mkorpershoek at baylibre.com>
 Michal Simek <michal.simek at amd.com> <Monstr at seznam.cz>
 Michal Simek <michal.simek at amd.com> <michal.simek at xilinx.com>
@@ -105,8 +105,6 @@ Nava kishore Manne <nava.kishore.manne at amd.com> <nava.manne at xilinx.com>
 Neal Frager <neal.frager at amd.com> <neal.frager at xilinx.com>
 Neil Armstrong <neil.armstrong at linaro.org> <narmstrong at baylibre.com>
 Nicolas Saenz Julienne <nsaenz at kernel.org> <nsaenzjulienne at suse.de>
-This contributor prefers not to receive mails <noreply at example.com> <pali at kernel.org>
-This contributor prefers not to receive mails <noreply at example.com> <pali.rohar at gmail.com>
 Padmarao Begari <padmarao.begari at amd.com> <padmarao.begari at microchip.com>
 Patrice Chotard <patrice.chotard at foss.st.com> <patrice.chotard at st.com>
 Patrick Delaunay <patrick.delaunay at foss.st.com> <patrick.delaunay at st.com>
@@ -147,9 +145,11 @@ Stefan Roese <stefan.roese at mailbox.org> <stroese>
 Stefano Babic <sbabic at nabladev.com>
 Stefano Stabellini <stefano.stabellini at amd.com> <stefano.stabellini at xilinx.com>
 Sughosh Ganu <sughosh.ganu at arm.com> <sughosh.ganu at linaro.org>
-No generic patch CC mail please <noreply at example.com> <swarren at wwwdotorg.org>
-No generic patch CC mail please <noreply at example.com> <swarren at nvidia.com>
 Sumit Garg <sumit.garg at kernel.org> <sumit.garg at linaro.org>
+This contributor prefers not to receive mails <noreply at example.com> <pali.rohar at gmail.com>
+This contributor prefers not to receive mails <noreply at example.com> <pali at kernel.org>
+This contributor prefers not to receive mails <noreply at example.com> <swarren at nvidia.com>
+This contributor prefers not to receive mails <noreply at example.com> <swarren at wwwdotorg.org>
 Tom Rini <trini at konsulko.com> <trini at ti.com>
 Tomas Thoresen <tomas.thoresen at amd.com> <tomast at xilinx.com>
 TsiChung Liew <Tsi-Chung.Liew at freescale.com>
---
base-commit: bdcadd64dd750f617943ee7088ea4724e19d1f8b
branch: debian-sent3

-- 
2.43.0