The same kind of cleanup as sent earlier today (2e2ae79df4fabea0157c5eb527b5396eb89185a1 locally here) I asked all the people before, whether they like their lines added. Many had requests to change the order of the mail address. When having this patch applied, you'll notice the bug as described here http://marc.info/?l=git&m=137364524514927&w=2 http://www.mail-archive.com/git@xxxxxxxxxxxxxxx/msg31964.html ("Bug in .mailmap handling?", for example look for Knut Franke) Signed-off-by: Stefan Beller <stefanbeller@xxxxxxxxxxxxxx> --- .mailmap | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index 1179767..1d6ba17 100644 --- a/.mailmap +++ b/.mailmap @@ -7,6 +7,7 @@ Alejandro R. Sedeño <asedeno@xxxxxxx> <asedeno@xxxxxxx> Alexander Gavrilov <angavrilov@xxxxxxxxx> +Alexey Shumkin <alex.crezoff@xxxxxxxxx> <zapped@xxxxxxx> Alex Bennée <kernel-hacker@xxxxxxxxxx> Alex Riesen <raa.lkml@xxxxxxxxx> <fork0@xxxxxxxxxxx> Alex Riesen <raa.lkml@xxxxxxxxx> <raa@limbo.localdomain> @@ -18,12 +19,15 @@ anonymous <linux@xxxxxxxxxxx> anonymous <linux@xxxxxxxxxxx> Brandon Casey <drafnel@xxxxxxxxx> <casey@xxxxxxxxxxxxxxx> Brian M. Carlson <sandals@xxxxxxxxxxxxxxxxxxxxxxx> +Bryan Larsen <bryan@xxxxxxxxx> <bryan.larsen@xxxxxxxxx> +Bryan Larsen <bryan@xxxxxxxxx> <bryanlarsen@xxxxxxxxx> Cheng Renquan <crquan@xxxxxxxxx> Chris Shoemaker <c.shoemaker@xxxxxxx> Dana L. How <danahow@xxxxxxxxx> Dana L. How <how@xxxxxxxxxxxxxxxxxxxxxxx> Daniel Barkalow <barkalow@xxxxxxxxxxxx> Dan Johnson <computerdruid@xxxxxxxxx> +David Brown <git@xxxxxxxxxx> <davidb@xxxxxxxxxxx> David D. Kilzer <ddkilzer@xxxxxxxxxx> David Kågedal <davidk@xxxxxxxxxxxxxx> David Reiss <dreiss@xxxxxxxxxxxx> <dreiss@dreiss-vmware.(none)> @@ -31,7 +35,10 @@ David S. Miller <davem@xxxxxxxxxxxxx> Deskin Miller <deskinm@xxxxxxxxx> Dirk Süsserott <newsletter@xxxxxxxxxxx> Eric S. Raymond <esr@xxxxxxxxxxx> +Eric Blake <eblake@xxxxxxxxxx> <ebb9@xxxxxxx> +Eric Hanchrow <eric.hanchrow@xxxxxxxxx> <offby1@xxxxxxxxx> Erik Faye-Lund <kusmabite@xxxxxxxxx> <kusmabite@xxxxxxxxxxxxxx> +Eyvind Bernhardsen <eyvind.bernhardsen@xxxxxxxxx> <eyvind-git@xxxxxxxxxxxxxx> Florian Achleitner <florian.achleitner.2.6.31@xxxxxxxxx> <florian.achleitner2.6.31@xxxxxxxxx> Franck Bui-Huu <vagabon.xyz@xxxxxxxxx> <fbuihuu@xxxxxxxxx> Frank Lichtenheld <frank@xxxxxxxxxxxxxx> <djpig@xxxxxxxxxx> @@ -47,19 +54,25 @@ H. Peter Anvin <hpa@xxxxxxxxx> <hpa@xxxxxxxxxxxxxxxxxxxxxxxxx> H. Peter Anvin <hpa@xxxxxxxxx> <hpa@xxxxxxxxxxxxxxxxxxxxx> İsmail Dönmez <ismail@xxxxxxxxxxxxx> Jakub Narębski <jnareb@xxxxxxxxx> +Jason Riedy <ejr@xxxxxxxxxxxxxxxxx> <ejr@xxxxxxxxxxxxxxx> +Jason Riedy <ejr@xxxxxxxxxxxxxxxxx> <ejr@xxxxxxxxxxxxxxxxx> Jay Soffian <jaysoffian@xxxxxxxxx> <jaysoffian+git@xxxxxxxxx> J. Bruce Fields <bfields@xxxxxxxxxxxxxx> <bfields@xxxxxxxxxxxx> J. Bruce Fields <bfields@xxxxxxxxxxxxxx> <bfields@xxxxxxxxxxxxxxxxxxxxxxxx> J. Bruce Fields <bfields@xxxxxxxxxxxxxx> <bfields@xxxxxxxxxxxxxxxxxxx> Jeff King <peff@xxxxxxxx> <peff@xxxxxxxxxx> +Jeff Muizelaar <jmuizelaar@xxxxxxxxxxx> <jeff@xxxxxxxxxxxx> Joachim Berdal Haga <cjhaga@xxxxxxxxxx> Johannes Schindelin <Johannes.Schindelin@xxxxxx> <johannes.schindelin@xxxxxx> Johannes Sixt <j6t@xxxxxxxx> <johannes.sixt@xxxxxxxxxx> Johannes Sixt <j6t@xxxxxxxx> <J.Sixt@xxxxxxxxxxxxx> Johannes Sixt <j6t@xxxxxxxx> <j.sixt@xxxxxxxxxxxxx> +Jonathan del Strother <jon.delStrother@xxxxxxxxxxxxx> <maillist@xxxxxxxxxxxxxx> Jonathan Nieder <jrnieder@xxxxxxxxx> <jrnieder@xxxxxxxxxxxx> Jon Loeliger <jdl@xxxxxxxxxxxxx> -Jon Seymour <jon@xxxxxxxxxxxxxxxxxxxxx> +Jon Seymour <jon.seymour@xxxxxxxxx> <jon@xxxxxxxxxxxxxxxxxxxxx> +Josh Triplett <josh@xxxxxxxxxxxxxxxx> <josh@xxxxxxxxxxxxxxx> +Josh Triplett <josh@xxxxxxxxxxxxxxxx> <josht@xxxxxxxxxx> Junio C Hamano <gitster@xxxxxxxxx> <gitster@xxxxxxxxx> Junio C Hamano <gitster@xxxxxxxxx> <junio@xxxxxxxxxxxxxxx> Junio C Hamano <gitster@xxxxxxxxx> <junio@xxxxxxxxxx> @@ -71,11 +84,14 @@ Karl Wiberg <kha@xxxxxxxxxxx> Karl Hasselström <kha@xxxxxxxxxxx> Karl Wiberg <kha@xxxxxxxxxxx> Karl Hasselström <kha@xxxxxxxxxxxxxxxxxxxxxxxxx> Kay Sievers <kay.sievers@xxxxxxxx> <kay@mam.(none)> Kay Sievers <kay.sievers@xxxxxxxx> <kay.sievers@xxxxxxx> +Karsten Blees <blees@xxxxxxx> <karsten.blees@xxxxxxx> +Karsten Blees <blees@xxxxxxx> <karsten.blees@xxxxxxxxx> Keith Cascio <keith@xxxxxxxxxxx> <keith@xxxxxxxxxxx> Kent Engstrom <kent@xxxxxxxxxxxxxx> Kevin Leung <kevinlsk@xxxxxxxxx> Kirill Smelkov <kirr@xxxxxxxxxxxxxx> <kirr@xxxxxxxxxxxxxxxxxxx> Kirill Smelkov <kirr@xxxxxxxxxxxxxx> <kirr@xxxxxxxxxx> +Knut Franke <Knut.Franke@xxxxxx> <k.franke@xxxxxxxxxxxxxxxxxxxx> Lars Doelle <lars.doelle@on-line ! de> Lars Doelle <lars.doelle@xxxxxxxxxx> Li Hong <leehong@xxxxxxxxxx> @@ -85,11 +101,14 @@ Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> <torvalds@xxxxxxxx> Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> <torvalds@xxxxxxxxxxxxxxx> Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> <torvalds@xxxxxxxxxxxxxxx.(none)> Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> <torvalds@xxxxxxxxxxxxxxxxxxxxxxxxxx> -Lukas Sandström <lukass@xxxxxxxxxxxxxxxx> +Lukas Sandström <luksan@xxxxxxxxx> <lukass@xxxxxxxxxxxxxxxx> +Matt Kraai <kraai@xxxxxxxxx> <matt.kraai@xxxxxxxxxxxxxx> Marc-André Lureau <marcandre.lureau@xxxxxxxxx> +Mark Levedahl <mdl123@xxxxxxxxxxx> <mlevedahl@xxxxxxxxx> Mark Rada <marada@xxxxxxxxxxxx> Martin Langhoff <martin@xxxxxxxxxx> <martin@xxxxxxxxxxxxxxx> Martin von Zweigbergk <martinvonz@xxxxxxxxx> <martin.von.zweigbergk@xxxxxxxxx> +Matt Draisey <matt@xxxxxxxxxx> <mattdraisey@xxxxxxxxxxxx> Matthias Kestenholz <matthias@xxxxxxxxxxx> <mk@xxxxxxxxxxx> Matthias Urlichs <matthias@xxxxxxxxxx> <smurf@kiste.(none)> Matthias Urlichs <matthias@xxxxxxxxxx> <smurf@xxxxxxxxxxxxxx> @@ -104,8 +123,11 @@ Namhyung Kim <namhyung@xxxxxxxxx> <namhyung@xxxxxxxxxx> Namhyung Kim <namhyung@xxxxxxxxx> <namhyung.kim@xxxxxxx> Nanako Shiraishi <nanako3@xxxxxxxxxxxxxx> Nanako Shiraishi <nanako3@xxxxxxxxxxx> +Nelson Elhage <nelhage@xxxxxxx> <nelhage@xxxxxxxxxxx> +Nelson Elhage <nelhage@xxxxxxx> <nelhage@xxxxxxx> Nguyễn Thái Ngọc Duy <pclouds@xxxxxxxxx> <nico@xxxxxxxxxxx> <nico@xxxxxxx> +Paolo Bonzini <bonzini@xxxxxxx> <paolo.bonzini@xxxxxxxxxxx> Pascal Obry <pascal@xxxxxxxx> <pascal.obry@xxxxxxxxx> Pascal Obry <pascal@xxxxxxxx> <pascal.obry@xxxxxxxxxx> Paul Mackerras <paulus@xxxxxxxxx> <paulus@dorrigo.(none)> @@ -114,6 +136,7 @@ Peter Krefting <peter@xxxxxxxxxxxxxxxx> <peter@xxxxxxxxxxxxxxxx> Peter Krefting <peter@xxxxxxxxxxxxxxxx> <peter@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx> Petr Baudis <pasky@xxxxxx> <pasky@xxxxxxx> Petr Baudis <pasky@xxxxxx> <xpasky@machine> +Phil Hord <hordp@xxxxxxxxx> <phil.hord@xxxxxxxxx> Philippe Bruhat <book@xxxxxxxx> Ralf Thielow <ralf.thielow@xxxxxxxxx> <ralf.thielow@xxxxxxxxxxxxxx> Ramsay Allan Jones <ramsay@xxxxxxxxxxxxxxxxxxx> @@ -145,6 +168,7 @@ Uwe Kleine-König <uzeisberger@xxxxxxxxxxxxx> Uwe Kleine-König <zeisberg@xxxxxxxxxxxxxxxxxxxxxxxxxx> Ville Skyttä <scop@xxxxxxxxxx> Vitaly "_Vi" Shukela <public_vi@xxxxxx> +W. Trevor King <wking@xxxxxxxxxx> <wking@xxxxxxxxxx> William Pursell <bill.pursell@xxxxxxxxx> YOSHIFUJI Hideaki <yoshfuji@xxxxxxxxxxxxxx> -- 1.8.3.2.790.g9192b0b -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html