Merge tag 'pstore-v5.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux

Pull mailmap update from Kees Cook:
 "This was originally part of my pstore tree, but when I realized that
  mailmap needed re-alphabetizing, I decided to wait until -rc1 to send
  this, as I saw a lot of mailmap additions pending in -next for the
  merge window.

  It's a programmatic reordering and the addition of a pstore
  contributor's preferred email address"

* tag 'pstore-v5.9-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux:
  mailmap: Add WeiXiong Liao
  mailmap: Restore dictionary sorting

1 files changed, 58 insertions, 57 deletions

diff --git a/.mailmap b/.mailmap
index 57fe0085b465..97fd835bd2a4 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]>
 Adriana Reus <[email protected]> <[email protected]>
+Adrian Bunk <[email protected]>
 Alan Cox <[email protected]>
 Alan Cox <[email protected]>
-Aleksey Gorelov <[email protected]>
 Aleksandar Markovic <[email protected]> <[email protected]>
-Alex Shi <[email protected]> <[email protected]>
-Alex Shi <[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]>
+Alex Shi <[email protected]> <[email protected]>
+Alex Shi <[email protected]> <[email protected]>
 Al Viro <[email protected]>
 Al Viro <[email protected]>
 Andi Shyti <[email protected]> <[email protected]>
 Andreas Herrmann <[email protected]>
-Andrey Ryabinin <[email protected]> <[email protected]>
 Andrew Morton <[email protected]>
-Andrew Murray <[email protected]> <[email protected]>
 Andrew Murray <[email protected]> <[email protected]>
+Andrew Murray <[email protected]> <[email protected]>
 Andrew Vasquez <[email protected]>
+Andrey Ryabinin <[email protected]> <[email protected]>
 Andy Adamson <[email protected]>
 Antoine Tenart <[email protected]>
 Antonio Ospite <[email protected]> <[email protected]>
@@ -48,40 +48,42 @@ Arnaud Patard <[email protected]>
 Arnd Bergmann <[email protected]>
 Axel Dyks <[email protected]>
 Axel Lin <[email protected]>
-Bart Van Assche <[email protected]> <[email protected]>
 Bart Van Assche <[email protected]> <[email protected]>
+Bart Van Assche <[email protected]> <[email protected]>
 Ben Gardner <[email protected]>
 Ben M Cahill <[email protected]>
 Björn Steinbrink <[email protected]>
-Boris Brezillon <[email protected]> <[email protected]>
-Boris Brezillon <[email protected]> <[email protected]>
 Boris Brezillon <[email protected]> <[email protected]>
 Boris Brezillon <[email protected]> <[email protected]>
+Boris Brezillon <[email protected]> <[email protected]>
+Boris Brezillon <[email protected]> <[email protected]>
 Brian Avery <[email protected]>
 Brian King <[email protected]>
+Changbin Du <[email protected]> <[email protected]>
+Changbin Du <[email protected]> <[email protected]>
 Chao Yu <[email protected]> <[email protected]>
 Chao Yu <[email protected]> <[email protected]>
-Christoph Hellwig <[email protected]>
 Christophe Ricard <[email protected]>
+Christoph Hellwig <[email protected]>
 Corey Minyard <[email protected]>
 Damian Hobson-Garcia <[email protected]>
-Daniel Borkmann <[email protected]> <[email protected]>
-Daniel Borkmann <[email protected]> <[email protected]>
+Daniel Borkmann <[email protected]> <[email protected]>
 Daniel Borkmann <[email protected]> <[email protected]>
 Daniel Borkmann <[email protected]> <[email protected]>
-Daniel Borkmann <[email protected]> <[email protected]>
+Daniel Borkmann <[email protected]> <[email protected]>
+Daniel Borkmann <[email protected]> <[email protected]>
 Daniel Borkmann <[email protected]> <[email protected]>
 David Brownell <[email protected]>
 David Woodhouse <[email protected]>
-Dengcheng Zhu <[email protected]> <[email protected]>
-Dengcheng Zhu <[email protected]> <[email protected]>
 Dengcheng Zhu <[email protected]> <[email protected]>
 Dengcheng Zhu <[email protected]> <[email protected]>
+Dengcheng Zhu <[email protected]> <[email protected]>
+Dengcheng Zhu <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
 Dmitry Eremin-Solenikov <[email protected]>
-Dmitry Safonov <[email protected]> <[email protected]>
-Dmitry Safonov <[email protected]> <[email protected]>
 Dmitry Safonov <[email protected]> <[email protected]>
+Dmitry Safonov <[email protected]> <[email protected]>
+Dmitry Safonov <[email protected]> <[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 Rowand <[email protected]> <[email protected]>
 Frank Rowand <[email protected]> <[email protected]>
 Frank Rowand <[email protected]> <[email protected]>
+Frank Rowand <[email protected]> <[email protected]>
 Frank Zago <[email protected]>
 Gao Xiang <[email protected]> <[email protected]>
 Gao Xiang <[email protected]> <[email protected]>
-Gerald Schaefer <[email protected]> <[email protected]>
 Gerald Schaefer <[email protected]> <[email protected]>
+Gerald Schaefer <[email protected]> <[email protected]>
 Gerald Schaefer <[email protected]> <[email protected]>
 Greg Kroah-Hartman <greg@echidna.(none)>
 Greg Kroah-Hartman <[email protected]>
 Greg Kroah-Hartman <[email protected]>
 Greg Kurz <[email protected]> <[email protected]>
 Gregory CLEMENT <[email protected]> <[email protected]>
+Gustavo Padovan <[email protected]>
+Gustavo Padovan <[email protected]>
 Hanjun Guo <[email protected]> <[email protected]>
 Heiko Carstens <[email protected]> <[email protected]>
 Heiko Carstens <[email protected]> <[email protected]>
@@ -115,32 +119,32 @@ Henrik Rydberg <[email protected]>
 Herbert Xu <[email protected]>
 Jacob Shin <[email protected]>
 Jaegeuk Kim <[email protected]> <[email protected]>
-Jaegeuk Kim <[email protected]> <[email protected]>
 Jaegeuk Kim <[email protected]> <[email protected]>
+Jaegeuk Kim <[email protected]> <[email protected]>
 Jakub Kicinski <[email protected]> <[email protected]>
 James Bottomley <jejb@mulgrave.(none)>
 James Bottomley <[email protected]>
 James E Wilson <[email protected]>
-James Hogan <[email protected]> <[email protected]>
 James Hogan <[email protected]> <[email protected]>
+James Hogan <[email protected]> <[email protected]>
 James Ketrenos <jketreno@io.(none)>
 Jan Glauber <[email protected]> <[email protected]>
 Jan Glauber <[email protected]> <[email protected]>
 Jan Glauber <[email protected]> <[email protected]>
 Jason Gunthorpe <[email protected]> <[email protected]>
 Jason Gunthorpe <[email protected]> <[email protected]>
-Javi Merino <[email protected]> <[email protected]>
 <[email protected]> <[email protected]>
+Javi Merino <[email protected]> <[email protected]>
 Jayachandran C <[email protected]> <[email protected]>
 Jayachandran C <[email protected]> <[email protected]>
 Jayachandran C <[email protected]> <[email protected]>
 Jayachandran C <[email protected]> <[email protected]>
-Jean Tourrilhes <[email protected]>
 <[email protected]> <[email protected]>
+Jean Tourrilhes <[email protected]>
 Jeff Garzik <[email protected]>
-Jeff Layton <[email protected]> <[email protected]>
 Jeff Layton <[email protected]> <[email protected]>
 Jeff Layton <[email protected]> <[email protected]>
+Jeff Layton <[email protected]> <[email protected]>
 Jens Axboe <[email protected]>
 Jens Osterkamp <[email protected]>
 Jiri Slaby <[email protected]> <[email protected]>
@@ -164,30 +168,30 @@ Julien Thierry <[email protected]> <[email protected]>
 Kamil Konieczny <[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]>
 Koushik <[email protected]>
-Krzysztof Kozlowski <[email protected]> <[email protected]>
 Krzysztof Kozlowski <[email protected]> <[email protected]>
+Krzysztof Kozlowski <[email protected]> <[email protected]>
 Kuninori Morimoto <[email protected]>
-Leon Romanovsky <[email protected]> <[email protected]>
-Leon Romanovsky <[email protected]> <[email protected]>
 Leonardo Bras <[email protected]> <[email protected]>
 Leonid I Ananiev <[email protected]>
+Leon Romanovsky <[email protected]> <[email protected]>
+Leon Romanovsky <[email protected]> <[email protected]>
 Linas Vepstas <[email protected]>
-Linus Lüssing <[email protected]> <[email protected]>
 Linus Lüssing <[email protected]> <[email protected]>
-Li Yang <[email protected]> <[email protected]>
+Linus Lüssing <[email protected]> <[email protected]>
 Li Yang <[email protected]> <[email protected]>
+Li Yang <[email protected]> <[email protected]>
 Lukasz Luba <[email protected]> <[email protected]>
 Maciej W. Rozycki <[email protected]> <[email protected]>
-Marc Zyngier <[email protected]> <[email protected]>
 Marcin Nowakowski <[email protected]> <[email protected]>
+Marc Zyngier <[email protected]> <[email protected]>
 Mark Brown <[email protected]>
 Mark Yao <[email protected]> <[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]>
 Matthew Wilcox <[email protected]> <[email protected]>
 Matthew Wilcox <[email protected]> <[email protected]>
@@ -197,17 +201,17 @@ Matthew Wilcox <[email protected]> <[email protected]>
 Matthew Wilcox <[email protected]> <[email protected]>
 Matthew Wilcox <[email protected]> <[email protected]>
 Matthieu CASTET <[email protected]>
-Mauro Carvalho Chehab <[email protected]> <[email protected]>
+Matt Ranostay <[email protected]> <[email protected]>
+Matt Ranostay <[email protected]> Matthew Ranostay <[email protected]>
+Matt Ranostay <[email protected]> <[email protected]>
+Matt Redfearn <[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]>
 Mauro Carvalho Chehab <[email protected]> <[email protected]>
-Matt Ranostay <[email protected]> Matthew Ranostay <[email protected]>
-Matt Ranostay <[email protected]> <[email protected]>
-Matt Ranostay <[email protected]> <[email protected]>
-Matt Redfearn <[email protected]> <[email protected]>
 Maxime Ripard <[email protected]> <[email protected]>
 Maxime Ripard <[email protected]> <[email protected]>
 Mayuresh Janorkar <[email protected]>
@@ -239,13 +243,13 @@ Paolo 'Blaisorblade' Giarrusso <[email protected]>
 Patrick Mochel <[email protected]>
 Paul Burton <[email protected]> <[email protected]>
 Paul Burton <[email protected]> <[email protected]>
+Paul E. McKenney <[email protected]> <[email protected]>
 Paul E. McKenney <[email protected]> <[email protected]>
 Paul E. McKenney <[email protected]> <[email protected]>
-Paul E. McKenney <[email protected]> <[email protected]>
 Paul E. McKenney <[email protected]> <[email protected]>
 Peter A Jonsson <[email protected]>
-Peter Oruba <[email protected]>
 Peter Oruba <[email protected]>
+Peter Oruba <[email protected]>
 Pratyush Anand <[email protected]> <[email protected]>
 Praveen BP <[email protected]>
 Punit Agrawal <[email protected]> <[email protected]>
@@ -258,23 +262,23 @@ Ralf Baechle <[email protected]>
 Ralf Wildenhues <[email protected]>
 Randy Dunlap <[email protected]> <[email protected]>
 Rémi Denis-Courmont <[email protected]>
-Ricardo Ribalda <[email protected]> <[email protected]>
 Ricardo Ribalda <[email protected]> <[email protected]>
 Ricardo Ribalda <[email protected]> Ricardo Ribalda Delgado <[email protected]>
+Ricardo Ribalda <[email protected]> <[email protected]>
 Ross Zwisler <[email protected]> <[email protected]>
 Rudolf Marek <[email protected]>
 Rui Saraiva <[email protected]>
 Sachin P Sant <[email protected]>
-Sarangdhar Joshi <[email protected]>
+Sakari Ailus <[email protected]> <[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]>
-Sakari Ailus <[email protected]> <[email protected]>
 Sean Nyekjaer <[email protected]> <[email protected]>
-Sebastian Reichel <[email protected]> <[email protected]>
 Sebastian Reichel <[email protected]> <[email protected]>
+Sebastian Reichel <[email protected]> <[email protected]>
 Sedat Dilek <[email protected]> <[email protected]>
 Shiraz Hashim <[email protected]> <[email protected]>
 Shuah Khan <[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]>
+Steve Wise <[email protected]> <[email protected]>
+Steve Wise <[email protected]> <[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]>
 Tiezhu Yang <[email protected]> <[email protected]>
 Todor Tomov <[email protected]> <[email protected]>
 Tony Luck <[email protected]>
-TripleX Chung <[email protected]> <[email protected]>
 TripleX Chung <[email protected]> <[email protected]>
+TripleX Chung <[email protected]> <[email protected]>
 Tsuneo Yoshioka <[email protected]>
 Uwe Kleine-König <[email protected]>
 Uwe Kleine-König <[email protected]>
@@ -305,22 +312,16 @@ Valdis Kletnieks <[email protected]>
 Vinod Koul <[email protected]> <[email protected]>
 Vinod Koul <[email protected]> <[email protected]>
 Vinod Koul <[email protected]> <[email protected]>
+Viresh Kumar <[email protected]> <[email protected]>
 Viresh Kumar <[email protected]> <[email protected]>
 Viresh Kumar <[email protected]> <[email protected]>
-Viresh Kumar <[email protected]> <[email protected]>
 Vivien Didelot <[email protected]> <[email protected]>
 Vlad Dogaru <[email protected]> <[email protected]>
-Vladimir Davydov <[email protected]> <[email protected]>
 Vladimir Davydov <[email protected]> <[email protected]>
-Takashi YOSHII <[email protected]>
+Vladimir Davydov <[email protected]> <[email protected]>
+WeiXiong Liao <[email protected]> <[email protected]>
 Will Deacon <[email protected]> <[email protected]>
-Wolfram Sang <[email protected]> <[email protected]>
 Wolfram Sang <[email protected]> <[email protected]>
+Wolfram Sang <[email protected]> <[email protected]>
 Yakir Yang <[email protected]> <[email protected]>
 Yusuke Goda <[email protected]>
-Gustavo Padovan <[email protected]>
-Gustavo Padovan <[email protected]>
-Changbin Du <[email protected]> <[email protected]>
-Changbin Du <[email protected]> <[email protected]>
-Steve Wise <[email protected]> <[email protected]>
-Steve Wise <[email protected]> <[email protected]>