[PATCH] mailmap: reroute openwrt.org email addresses

[Jonas Gorski]

Since the fork and remerge of LEDE and OpenWrt.org, use of @openwrt.org
addresses has been discouraged, and some addresses aren't even working
anymore. To avoid patches being overlooked add appropriate mappings
based on recent commit history in Linux and OpenWrt.

While at it, also update the addresses in MAINTAINERS.

Signed-off-by: Jonas Gorski <jonas.gorski@xxxxxxxxx>
---
 .mailmap    | 9 +++++++++
 MAINTAINERS | 4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index ae2bcad06f4b..842f69b019d4 100644
--- a/.mailmap
+++ b/.mailmap
@@ -58,14 +58,17 @@ Douglas Gilbert <dougg@xxxxxxxxxx>
 Ed L. Cashin <ecashin@xxxxxxxxxx>
 Evgeniy Polyakov <johnpol@xxxxxxxxxxx>
 Felipe W Damasio <felipewd@xxxxxxxxxxxx>
+Felix Fietkau <nbd@xxxxxxxx> <nbd@xxxxxxxxxxx>
 Felix Kuhling <fxkuehl@xxxxxx>
 Felix Moeller <felix@xxxxxxxxxxxx>
 Filipe Lautert <filipe@xxxxxxxxxxx>
+Florian Fainelli <f.fainelli@xxxxxxxxx> <florian@xxxxxxxxxxx>
 Franck Bui-Huu <vagabon.xyz@xxxxxxxxx>
 Frank Rowand <frowand.list@xxxxxxxxx> <frowand@xxxxxxxxxx>
 Frank Rowand <frowand.list@xxxxxxxxx> <frank.rowand@xxxxxxxxxxx>
 Frank Rowand <frowand.list@xxxxxxxxx> <frank.rowand@xxxxxxxxxxxxxx>
 Frank Zago <fzago@xxxxxxxxxxxxxxxxxxxxx>
+Gabor Juhos <juhosg@xxxxxxxxxxx> <juhosg@xxxxxxxxxxx>
 Greg Kroah-Hartman <greg@echidna.(none)>
 Greg Kroah-Hartman <gregkh@xxxxxxx>
 Greg Kroah-Hartman <greg@xxxxxxxxx>
@@ -94,13 +97,16 @@ Jens Axboe <axboe@xxxxxxx>
 Jens Osterkamp <Jens.Osterkamp@xxxxxxxxxx>
 Johan Hovold <johan@xxxxxxxxxx> <jhovold@xxxxxxxxx>
 Johan Hovold <johan@xxxxxxxxxx> <johan@xxxxxxxxxxxxxxxxxxxx>
+John Crispin <john@xxxxxxxxxxx> <blogic@xxxxxxxxxxx>
 John Paul Adrian Glaubitz <glaubitz@xxxxxxxxxxxxxxxxxxx>
 John Stultz <johnstul@xxxxxxxxxx>
+Jonas Gorski <jonas.gorski@xxxxxxxxx> <jogo@xxxxxxxxxxx>
 <josh@xxxxxxxxxxxxxxxx> <josh@xxxxxxxxxxxxxxx>
 <josh@xxxxxxxxxxxxxxxx> <josh@xxxxxxxxxx>
 <josh@xxxxxxxxxxxxxxxx> <josht@xxxxxxxxxxxxxxxxxx>
 <josh@xxxxxxxxxxxxxxxx> <josht@xxxxxxxxxx>
 <josh@xxxxxxxxxxxxxxxx> <josht@xxxxxxxxxxxx>
+Jo-Philipp Wich <jo@xxxxxxx> <jow@xxxxxxxxxxx>
 Juha Yrjola <at solidboot.com>
 Juha Yrjola <juha.yrjola@xxxxxxxxx>
 Juha Yrjola <juha.yrjola@xxxxxxxxxxxxx>
@@ -117,6 +123,7 @@ Leonid I Ananiev <leonid.i.ananiev@xxxxxxxxx>
 Linas Vepstas <linas@xxxxxxxxxxxxxx>
 Linus LÃssing <linus.luessing@xxxxxxxxx> <linus.luessing@xxxxxx>
 Linus LÃssing <linus.luessing@xxxxxxxxx> <linus.luessing@xxxxxxxx>
+Luka Perkov <luka.perkov@xxxxxxxxxx> <luka@xxxxxxxxxxx>
 Maciej W. Rozycki <macro@xxxxxxxx> <macro@xxxxxxxxxx>
 Marcin Nowakowski <marcin.nowakowski@xxxxxxxx> <marcin.nowakowski@xxxxxxxxxx>
 Mark Brown <broonie@xxxxxxxxxxxxx>
@@ -124,6 +131,7 @@ Mark Yao <markyao0591@xxxxxxxxx> <mark.yao@xxxxxxxxxxxxxx>
 Martin Kepplinger <martink@xxxxxxxxx> <martin.kepplinger@xxxxxxxxxxxxxxxxxxxxx>
 Martin Kepplinger <martink@xxxxxxxxx> <martin.kepplinger@xxxxxxxxxxxxx>
 Mathieu Othacehe <m.othacehe@xxxxxxxxx>
+Matteo Croce <matteo.croce@xxxxxxxxxxxxx> <matteo@xxxxxxxxxxx>
 Matthew Wilcox <willy@xxxxxxxxxxxxx> <matthew.r.wilcox@xxxxxxxxx>
 Matthew Wilcox <willy@xxxxxxxxxxxxx> <matthew@xxxxxx>
 Matthew Wilcox <willy@xxxxxxxxxxxxx> <mawilcox@xxxxxxxxxxxxxxxxx>
@@ -199,6 +207,7 @@ Shuah Khan <shuah@xxxxxxxxxx> <shuah.kh@xxxxxxxxxxx>
 Simon Kelley <simon@xxxxxxxxxxxxxxxxx>
 StÃphane Witzmann <stephane.witzmann@xxxxxxxxxxxxxxxxxxxxxxxxx>
 Stephen Hemminger <shemminger@xxxxxxxx>
+Steven Barth <steven@xxxxxxxxxxx> <cyrus@xxxxxxxxxxx>
 Subash Abhinov Kasiviswanathan <subashab@xxxxxxxxxxxxxx>
 Subhash Jadavani <subhashj@xxxxxxxxxxxxxx>
 Sudeep Holla <sudeep.holla@xxxxxxx> Sudeep KarkadaNagesha <sudeep.karkadanagesha@xxxxxxx>
diff --git a/MAINTAINERS b/MAINTAINERS
index 057a72a85156..6ab77d69842d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9736,7 +9736,7 @@ F:	drivers/leds/leds-mt6323.c
 F:	Documentation/devicetree/bindings/leds/leds-mt6323.txt
 
 MEDIATEK ETHERNET DRIVER
-M:	Felix Fietkau <nbd@xxxxxxxxxxx>
+M:	Felix Fietkau <nbd@xxxxxxxx>
 M:	John Crispin <john@xxxxxxxxxxx>
 M:	Sean Wang <sean.wang@xxxxxxxxxxxx>
 M:	Nelson Chang <nelson.chang@xxxxxxxxxxxx>
@@ -13048,7 +13048,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git
 F:	tools/testing/selftests/rcutorture
 
 RDC R-321X SoC
-M:	Florian Fainelli <florian@xxxxxxxxxxx>
+M:	Florian Fainelli <f.fainelli@xxxxxxxxx>
 S:	Maintained
 
 RDC R6040 FAST ETHERNET DRIVER
-- 
2.13.2