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.gor...@gmail.com> --- .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 <do...@torque.net> Ed L. Cashin <ecas...@coraid.com> Evgeniy Polyakov <john...@2ka.mipt.ru> Felipe W Damasio <felip...@terra.com.br> +Felix Fietkau <n...@nbd.name> <n...@openwrt.org> Felix Kuhling <fxku...@gmx.de> Felix Moeller <fe...@derklecks.de> Filipe Lautert <fil...@icewall.org> +Florian Fainelli <f.faine...@gmail.com> <flor...@openwrt.org> Franck Bui-Huu <vagabon....@gmail.com> Frank Rowand <frowand.l...@gmail.com> <frow...@mvista.com> Frank Rowand <frowand.l...@gmail.com> <frank.row...@am.sony.com> Frank Rowand <frowand.l...@gmail.com> <frank.row...@sonymobile.com> Frank Zago <fz...@systemfabricworks.com> +Gabor Juhos <juh...@freemail.hu> <juh...@openwrt.org> Greg Kroah-Hartman <greg@echidna.(none)> Greg Kroah-Hartman <gre...@suse.de> Greg Kroah-Hartman <g...@kroah.com> @@ -94,13 +97,16 @@ Jens Axboe <ax...@suse.de> Jens Osterkamp <jens.osterk...@de.ibm.com> Johan Hovold <jo...@kernel.org> <jhov...@gmail.com> Johan Hovold <jo...@kernel.org> <jo...@hovoldconsulting.com> +John Crispin <j...@phrozen.org> <blo...@openwrt.org> John Paul Adrian Glaubitz <glaub...@physik.fu-berlin.de> John Stultz <johns...@us.ibm.com> +Jonas Gorski <jonas.gor...@gmail.com> <j...@openwrt.org> <j...@joshtriplett.org> <j...@freedesktop.org> <j...@joshtriplett.org> <j...@kernel.org> <j...@joshtriplett.org> <jo...@linux.vnet.ibm.com> <j...@joshtriplett.org> <jo...@us.ibm.com> <j...@joshtriplett.org> <jo...@vnet.ibm.com> +Jo-Philipp Wich <j...@mein.io> <j...@openwrt.org> Juha Yrjola <at solidboot.com> Juha Yrjola <juha.yrj...@nokia.com> Juha Yrjola <juha.yrj...@solidboot.com> @@ -117,6 +123,7 @@ Leonid I Ananiev <leonid.i.anan...@intel.com> Linas Vepstas <li...@austin.ibm.com> Linus Lüssing <linus.luess...@c0d3.blue> <linus.luess...@web.de> Linus Lüssing <linus.luess...@c0d3.blue> <linus.luess...@ascom.ch> +Luka Perkov <luka.per...@sartura.hr> <l...@openwrt.org> Maciej W. Rozycki <ma...@mips.com> <ma...@imgtec.com> Marcin Nowakowski <marcin.nowakow...@mips.com> <marcin.nowakow...@imgtec.com> Mark Brown <broo...@sirena.org.uk> @@ -124,6 +131,7 @@ Mark Yao <markyao0...@gmail.com> <mark....@rock-chips.com> Martin Kepplinger <mart...@posteo.de> <martin.kepplin...@theobroma-systems.com> Martin Kepplinger <mart...@posteo.de> <martin.kepplin...@ginzinger.com> Mathieu Othacehe <m.othac...@gmail.com> +Matteo Croce <matteo.cr...@canonical.com> <mat...@openwrt.org> Matthew Wilcox <wi...@infradead.org> <matthew.r.wil...@intel.com> Matthew Wilcox <wi...@infradead.org> <matt...@wil.cx> Matthew Wilcox <wi...@infradead.org> <mawil...@linuxonhyperv.com> @@ -199,6 +207,7 @@ Shuah Khan <sh...@kernel.org> <shuah...@samsung.com> Simon Kelley <si...@thekelleys.org.uk> Stéphane Witzmann <stephane.witzm...@ubpmes.univ-bpclermont.fr> Stephen Hemminger <shemmin...@osdl.org> +Steven Barth <ste...@midlink.org> <cy...@openwrt.org> Subash Abhinov Kasiviswanathan <subas...@codeaurora.org> Subhash Jadavani <subha...@codeaurora.org> Sudeep Holla <sudeep.ho...@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanage...@arm.com> 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 <n...@openwrt.org> +M: Felix Fietkau <n...@nbd.name> M: John Crispin <j...@phrozen.org> M: Sean Wang <sean.w...@mediatek.com> M: Nelson Chang <nelson.ch...@mediatek.com> @@ -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 <flor...@openwrt.org> +M: Florian Fainelli <f.faine...@gmail.com> S: Maintained RDC R6040 FAST ETHERNET DRIVER -- 2.13.2
