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 <[email protected]>
---
.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 <[email protected]>
Ed L. Cashin <[email protected]>
Evgeniy Polyakov <[email protected]>
Felipe W Damasio <[email protected]>
+Felix Fietkau <[email protected]> <[email protected]>
Felix Kuhling <[email protected]>
Felix Moeller <[email protected]>
Filipe Lautert <[email protected]>
+Florian Fainelli <[email protected]> <[email protected]>
Franck Bui-Huu <[email protected]>
Frank Rowand <[email protected]> <[email protected]>
Frank Rowand <[email protected]> <[email protected]>
Frank Rowand <[email protected]> <[email protected]>
Frank Zago <[email protected]>
+Gabor Juhos <[email protected]> <[email protected]>
Greg Kroah-Hartman <greg@echidna.(none)>
Greg Kroah-Hartman <[email protected]>
Greg Kroah-Hartman <[email protected]>
@@ -94,13 +97,16 @@ Jens Axboe <[email protected]>
Jens Osterkamp <[email protected]>
Johan Hovold <[email protected]> <[email protected]>
Johan Hovold <[email protected]> <[email protected]>
+John Crispin <[email protected]> <[email protected]>
John Paul Adrian Glaubitz <[email protected]>
John Stultz <[email protected]>
+Jonas Gorski <[email protected]> <[email protected]>
<[email protected]> <[email protected]>
<[email protected]> <[email protected]>
<[email protected]> <[email protected]>
<[email protected]> <[email protected]>
<[email protected]> <[email protected]>
+Jo-Philipp Wich <[email protected]> <[email protected]>
Juha Yrjola <at solidboot.com>
Juha Yrjola <[email protected]>
Juha Yrjola <[email protected]>
@@ -117,6 +123,7 @@ Leonid I Ananiev <[email protected]>
Linas Vepstas <[email protected]>
Linus Lüssing <[email protected]> <[email protected]>
Linus Lüssing <[email protected]> <[email protected]>
+Luka Perkov <[email protected]> <[email protected]>
Maciej W. Rozycki <[email protected]> <[email protected]>
Marcin Nowakowski <[email protected]> <[email protected]>
Mark Brown <[email protected]>
@@ -124,6 +131,7 @@ Mark Yao <[email protected]> <[email protected]>
Martin Kepplinger <[email protected]> <[email protected]>
Martin Kepplinger <[email protected]> <[email protected]>
Mathieu Othacehe <[email protected]>
+Matteo Croce <[email protected]> <[email protected]>
Matthew Wilcox <[email protected]> <[email protected]>
Matthew Wilcox <[email protected]> <[email protected]>
Matthew Wilcox <[email protected]> <[email protected]>
@@ -199,6 +207,7 @@ Shuah Khan <[email protected]> <[email protected]>
Simon Kelley <[email protected]>
Stéphane Witzmann <[email protected]>
Stephen Hemminger <[email protected]>
+Steven Barth <[email protected]> <[email protected]>
Subash Abhinov Kasiviswanathan <[email protected]>
Subhash Jadavani <[email protected]>
Sudeep Holla <[email protected]> Sudeep KarkadaNagesha <[email protected]>
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 <[email protected]>
+M: Felix Fietkau <[email protected]>
M: John Crispin <[email protected]>
M: Sean Wang <[email protected]>
M: Nelson Chang <[email protected]>
@@ -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 <[email protected]>
+M: Florian Fainelli <[email protected]>
S: Maintained
RDC R6040 FAST ETHERNET DRIVER
--
2.13.2