aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKees Cook <[email protected]>2020-07-29 14:36:42 -0700
committerKees Cook <[email protected]>2020-08-17 14:32:44 -0700
commitd6bd5201f7eaa9c15ea9b0f8ff17dd7bc3b9d78f (patch)
treedfde54d2bb3981efff09b7b73b1bf3c23daabb0f
parent9123e3a74ec7b934a4a099e98af6a61c2f80bbf5 (diff)
mailmap: Restore dictionary sorting
Several names had been recently appended (instead of inserted). While git-shortlog doesn't need this file to be sorted, it helps humans to keep it organized this way. Sort the entire file (which includes some minor shuffling for dictionary order). Done with the following commands: grep -E '^(#|$)' .mailmap > .mailmap.head grep -Ev '^(#|$)' .mailmap > .mailmap.body sort -f .mailmap.body > .mailmap.body.sort cat .mailmap.head .mailmap.body.sort > .mailmap rm .mailmap.head .mailmap.body.sort Signed-off-by: Kees Cook <[email protected]>
-rw-r--r--.mailmap114
1 files changed, 57 insertions, 57 deletions
diff --git a/.mailmap b/.mailmap
index 57fe0085b465..d8c5bc01256d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -15,30 +15,30 @@
Aaron Durbin <[email protected]>
Adam Oldham <[email protected]>
Adam Radford <[email protected]>
-Adrian Bunk <[email protected]>
+Adrian Bunk <[email protected]>
Alan Cox <[email protected]>
Alan Cox <[email protected]>
-Aleksey Gorelov <[email protected]>
Aleksandar Markovic <[email protected]> <[email protected]>
+Aleksey Gorelov <[email protected]>
Alexander Lobakin <[email protected]> <[email protected]>
Alexander Lobakin <[email protected]> <[email protected]>
Alexander Lobakin <[email protected]> <[email protected]>
Alexandre Belloni <[email protected]> <[email protected]>
-Alexei Starovoitov <[email protected]> <[email protected]>
Alexei Starovoitov <[email protected]> <[email protected]>
Alexei Starovoitov <[email protected]> <[email protected]>
+Alexei Starovoitov <[email protected]> <[email protected]>
Andreas Herrmann <[email protected]>
Andrew Morton <[email protected]>
Andrew Vasquez <[email protected]>
Andy Adamson <[email protected]>
Antoine Tenart <[email protected]>
@@ -48,40 +48,42 @@ Arnaud Patard <[email protected]>
Arnd Bergmann <[email protected]>
Axel Dyks <[email protected]>
Axel Lin <[email protected]>
Ben Gardner <[email protected]>
Ben M Cahill <[email protected]>
Björn Steinbrink <[email protected]>
Brian Avery <[email protected]>
Brian King <[email protected]>
-Christoph Hellwig <[email protected]>
Christophe Ricard <[email protected]>
+Christoph Hellwig <[email protected]>
Corey Minyard <[email protected]>
Damian Hobson-Garcia <[email protected]>
David Brownell <[email protected]>
David Woodhouse <[email protected]>
Dmitry Eremin-Solenikov <[email protected]>
Domen Puncer <[email protected]>
Douglas Gilbert <[email protected]>
Ed L. Cashin <[email protected]>
@@ -92,20 +94,22 @@ Felix Kuhling <[email protected]>
Felix Moeller <[email protected]>
Filipe Lautert <[email protected]>
Franck Bui-Huu <[email protected]>
Frank Zago <[email protected]>
Greg Kroah-Hartman <greg@echidna.(none)>
Greg Kroah-Hartman <[email protected]>
Greg Kroah-Hartman <[email protected]>
+Gustavo Padovan <[email protected]>
+Gustavo Padovan <[email protected]>
@@ -115,32 +119,32 @@ Henrik Rydberg <[email protected]>
Herbert Xu <[email protected]>
Jacob Shin <[email protected]>
James Bottomley <jejb@mulgrave.(none)>
James Bottomley <[email protected]>
James E Wilson <[email protected]>
James Ketrenos <jketreno@io.(none)>
-Jean Tourrilhes <[email protected]>
+Jean Tourrilhes <[email protected]>
Jeff Garzik <[email protected]>
Jens Axboe <[email protected]>
Jens Osterkamp <[email protected]>
@@ -164,30 +168,30 @@ Julien Thierry <[email protected]> <[email protected]>
Kay Sievers <[email protected]>
Kenneth W Chen <[email protected]>
-Konstantin Khlebnikov <[email protected]> <[email protected]>
Konstantin Khlebnikov <[email protected]> <[email protected]>
+Konstantin Khlebnikov <[email protected]> <[email protected]>
-Krzysztof Kozlowski <[email protected]> <[email protected]>
Krzysztof Kozlowski <[email protected]> <[email protected]>
+Krzysztof Kozlowski <[email protected]> <[email protected]>
Kuninori Morimoto <[email protected]>
Leonid I Ananiev <[email protected]>
Linas Vepstas <[email protected]>
Maciej W. Rozycki <[email protected]> <[email protected]>
Marcin Nowakowski <[email protected]> <[email protected]>
Mark Brown <[email protected]>
-Martin Kepplinger <[email protected]> <[email protected]>
Martin Kepplinger <[email protected]> <[email protected]>
Martin Kepplinger <[email protected]> <[email protected]>
+Martin Kepplinger <[email protected]> <[email protected]>
Mathieu Othacehe <[email protected]>
@@ -197,17 +201,17 @@ Matthew Wilcox <[email protected]> <[email protected]>
Matthieu CASTET <[email protected]>
-Mauro Carvalho Chehab <[email protected]> <[email protected]>
+Matt Ranostay <[email protected]> Matthew Ranostay <[email protected]>
Mauro Carvalho Chehab <[email protected]> <[email protected]>
+Mauro Carvalho Chehab <[email protected]> <[email protected]>
Mauro Carvalho Chehab <[email protected]> <[email protected]>
+Mauro Carvalho Chehab <[email protected]> <[email protected]>
Mauro Carvalho Chehab <[email protected]> <[email protected]>
Mauro Carvalho Chehab <[email protected]> <[email protected]>
-Mauro Carvalho Chehab <[email protected]> <[email protected]>
Mauro Carvalho Chehab <[email protected]> <[email protected]>
-Matt Ranostay <[email protected]> Matthew Ranostay <[email protected]>
Mayuresh Janorkar <[email protected]>
@@ -239,13 +243,13 @@ Paolo 'Blaisorblade' Giarrusso <[email protected]>
Patrick Mochel <[email protected]>
Peter A Jonsson <[email protected]>
-Peter Oruba <[email protected]>
Peter Oruba <[email protected]>
+Peter Oruba <[email protected]>
Praveen BP <[email protected]>
@@ -258,23 +262,23 @@ Ralf Baechle <[email protected]>
Ralf Wildenhues <[email protected]>
Rémi Denis-Courmont <[email protected]>
Ricardo Ribalda <[email protected]> Ricardo Ribalda Delgado <[email protected]>
Rudolf Marek <[email protected]>
Rui Saraiva <[email protected]>
Sachin P Sant <[email protected]>
-Sarangdhar Joshi <[email protected]>
Sam Ravnborg <[email protected]>
-Santosh Shilimkar <[email protected]>
Santosh Shilimkar <[email protected]>
+Santosh Shilimkar <[email protected]>
+Sarangdhar Joshi <[email protected]>
Sascha Hauer <[email protected]>
S.Çağlar Onur <[email protected]>
-Sebastian Reichel <[email protected]> <[email protected]>
Sebastian Reichel <[email protected]> <[email protected]>
+Sebastian Reichel <[email protected]> <[email protected]>
@@ -285,18 +289,21 @@ Simon Arlott <[email protected]> <[email protected]>
Simon Kelley <[email protected]>
Stéphane Witzmann <[email protected]>
Stephen Hemminger <[email protected]>
Subash Abhinov Kasiviswanathan <[email protected]>
Subhash Jadavani <[email protected]>
Sudeep Holla <[email protected]> Sudeep KarkadaNagesha <[email protected]>
Sumit Semwal <[email protected]>
+Takashi YOSHII <[email protected]>
Tejun Heo <[email protected]>
Thomas Graf <[email protected]>
Thomas Pedersen <[email protected]>
Tony Luck <[email protected]>
Tsuneo Yoshioka <[email protected]>
Uwe Kleine-König <[email protected]>
Uwe Kleine-König <[email protected]>
@@ -305,22 +312,15 @@ Valdis Kletnieks <[email protected]>
-Takashi YOSHII <[email protected]>
Yusuke Goda <[email protected]>
-Gustavo Padovan <[email protected]>
-Gustavo Padovan <[email protected]>