[PATCH 1/2] mailmap: Restore dictionary sorting

[Kees Cook]

Several names had been recently appended (instead of inserted). 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 <keesc...@chromium.org>
---
 .mailmap | 110 +++++++++++++++++++++++++++----------------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/.mailmap b/.mailmap
index c69d9c734fb5..4e6c169719df 100644
--- a/.mailmap
+++ b/.mailmap
@@ -10,27 +10,27 @@
 Aaron Durbin <adur...@google.com>
 Adam Oldham <oldha...@gmail.com>
 Adam Radford <aradf...@gmail.com>
-Adrian Bunk <b...@stusta.de>
 Adriana Reus <adi.r...@gmail.com> <adriana.r...@intel.com>
+Adrian Bunk <b...@stusta.de>
 Alan Cox <a...@lxorguk.ukuu.org.uk>
 Alan Cox <r...@hraefn.swansea.linux.org.uk>
-Aleksey Gorelov <aleksey_gore...@phoenix.com>
 Aleksandar Markovic <aleksandar.marko...@mips.com> 
<aleksandar.marko...@imgtec.com>
-Alex Shi <alex....@linux.alibaba.com> <alex....@intel.com>
-Alex Shi <alex....@linux.alibaba.com> <alex....@linaro.org>
+Aleksey Gorelov <aleksey_gore...@phoenix.com>
 Alexandre Belloni <alexandre.bell...@bootlin.com> 
<alexandre.bell...@free-electrons.com>
-Alexei Starovoitov <a...@kernel.org> <a...@plumgrid.com>
 Alexei Starovoitov <a...@kernel.org> <alexei.starovoi...@gmail.com>
 Alexei Starovoitov <a...@kernel.org> <a...@fb.com>
+Alexei Starovoitov <a...@kernel.org> <a...@plumgrid.com>
+Alex Shi <alex....@linux.alibaba.com> <alex....@intel.com>
+Alex Shi <alex....@linux.alibaba.com> <alex....@linaro.org>
 Al Viro <v...@ftp.linux.org.uk>
 Al Viro <v...@zeniv.linux.org.uk>
 Andi Shyti <a...@etezian.org> <andi.sh...@samsung.com>
 Andreas Herrmann <aherr...@de.ibm.com>
-Andrey Ryabinin <ryabinin....@gmail.com> <a.ryabi...@samsung.com>
 Andrew Morton <a...@linux-foundation.org>
-Andrew Murray <amur...@thegoodpenguin.co.uk> <andrew.mur...@arm.com>
 Andrew Murray <amur...@thegoodpenguin.co.uk> <amur...@embedded-bits.co.uk>
+Andrew Murray <amur...@thegoodpenguin.co.uk> <andrew.mur...@arm.com>
 Andrew Vasquez <andrew.vasq...@qlogic.com>
+Andrey Ryabinin <ryabinin....@gmail.com> <a.ryabi...@samsung.com>
 Andy Adamson <and...@citi.umich.edu>
 Antoine Tenart <antoine.ten...@free-electrons.com>
 Antonio Ospite <a...@ao2.it> <a...@amarulasolutions.com>
@@ -40,40 +40,42 @@ Arnaud Patard <arnaud.pat...@rtp-net.org>
 Arnd Bergmann <a...@arndb.de>
 Axel Dyks <x...@xlsigned.net>
 Axel Lin <axel....@gmail.com>
-Bart Van Assche <bvanass...@acm.org> <bart.vanass...@wdc.com>
 Bart Van Assche <bvanass...@acm.org> <bart.vanass...@sandisk.com>
+Bart Van Assche <bvanass...@acm.org> <bart.vanass...@wdc.com>
 Ben Gardner <bgard...@wabtec.com>
 Ben M Cahill <ben.m.cah...@intel.com>
 Björn Steinbrink <b.steinbr...@gmx.de>
-Boris Brezillon <bbrezil...@kernel.org> <boris.brezil...@bootlin.com>
-Boris Brezillon <bbrezil...@kernel.org> <boris.brezil...@free-electrons.com>
 Boris Brezillon <bbrezil...@kernel.org> <b.brezillon....@gmail.com>
 Boris Brezillon <bbrezil...@kernel.org> <b.brezil...@overkiz.com>
+Boris Brezillon <bbrezil...@kernel.org> <boris.brezil...@bootlin.com>
+Boris Brezillon <bbrezil...@kernel.org> <boris.brezil...@free-electrons.com>
 Brian Avery <b.av...@hp.com>
 Brian King <brk...@us.ibm.com>
+Changbin Du <changbin...@intel.com> <changbin...@gmail.com>
+Changbin Du <changbin...@intel.com> <changbin...@intel.com>
 Chao Yu <c...@kernel.org> <chao2...@samsung.com>
 Chao Yu <c...@kernel.org> <yuch...@huawei.com>
-Christoph Hellwig <h...@lst.de>
 Christophe Ricard <christophe.ric...@gmail.com>
+Christoph Hellwig <h...@lst.de>
 Corey Minyard <miny...@acm.org>
 Damian Hobson-Garcia <dhobs...@igel.co.jp>
-Daniel Borkmann <dan...@iogearbox.net> <dbork...@redhat.com>
-Daniel Borkmann <dan...@iogearbox.net> <dborkm...@redhat.com>
+Daniel Borkmann <dan...@iogearbox.net> <danborkm...@googlemail.com>
 Daniel Borkmann <dan...@iogearbox.net> <danborkm...@iogearbox.net>
 Daniel Borkmann <dan...@iogearbox.net> <daniel.borkm...@tik.ee.ethz.ch>
-Daniel Borkmann <dan...@iogearbox.net> <danborkm...@googlemail.com>
+Daniel Borkmann <dan...@iogearbox.net> <dborkm...@redhat.com>
+Daniel Borkmann <dan...@iogearbox.net> <dbork...@redhat.com>
 Daniel Borkmann <dan...@iogearbox.net> <dxc...@gmail.com>
 David Brownell <davi...@pacbell.net>
 David Woodhouse <dw...@shinybook.infradead.org>
-Dengcheng Zhu <d...@wavecomp.com> <dengcheng....@mips.com>
-Dengcheng Zhu <d...@wavecomp.com> <dengcheng....@imgtec.com>
 Dengcheng Zhu <d...@wavecomp.com> <dc...@mips.com>
 Dengcheng Zhu <d...@wavecomp.com> <dengcheng....@gmail.com>
+Dengcheng Zhu <d...@wavecomp.com> <dengcheng....@imgtec.com>
+Dengcheng Zhu <d...@wavecomp.com> <dengcheng....@mips.com>
 <dev.k...@vandijck-laurijssen.be> <kurt.van.di...@eia.be>
 Dmitry Eremin-Solenikov <dbarysh...@gmail.com>
-Dmitry Safonov <0x7f454...@gmail.com> <dsafo...@virtuozzo.com>
-Dmitry Safonov <0x7f454...@gmail.com> <d.safo...@partner.samsung.com>
 Dmitry Safonov <0x7f454...@gmail.com> <d...@arista.com>
+Dmitry Safonov <0x7f454...@gmail.com> <d.safo...@partner.samsung.com>
+Dmitry Safonov <0x7f454...@gmail.com> <dsafo...@virtuozzo.com>
 Domen Puncer <do...@coderock.org>
 Douglas Gilbert <do...@torque.net>
 Ed L. Cashin <ecas...@coraid.com>
@@ -84,9 +86,9 @@ Felix Kuhling <fxku...@gmx.de>
 Felix Moeller <fe...@derklecks.de>
 Filipe Lautert <fil...@icewall.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 Rowand <frowand.l...@gmail.com> <frow...@mvista.com>
 Frank Zago <fz...@systemfabricworks.com>
 Gao Xiang <xi...@kernel.org> <gaoxian...@huawei.com>
 Gao Xiang <xi...@kernel.org> <hsiang...@aol.com>
@@ -94,6 +96,8 @@ Greg Kroah-Hartman <greg@echidna.(none)>
 Greg Kroah-Hartman <gre...@suse.de>
 Greg Kroah-Hartman <g...@kroah.com>
 Gregory CLEMENT <gregory.clem...@bootlin.com> 
<gregory.clem...@free-electrons.com>
+Gustavo Padovan <gust...@las.ic.unicamp.br>
+Gustavo Padovan <pado...@profusion.mobi>
 Hanjun Guo <guohan...@huawei.com> <hanjun....@linaro.org>
 Henk Vergonet <henk.vergo...@gmail.com>
 Henrik Kretzschmar <he...@nachtwindheim.de>
@@ -101,32 +105,32 @@ Henrik Rydberg <rydb...@bitmath.org>
 Herbert Xu <herb...@gondor.apana.org.au>
 Jacob Shin <jacob.s...@amd.com>
 Jaegeuk Kim <jaeg...@kernel.org> <jaeg...@google.com>
-Jaegeuk Kim <jaeg...@kernel.org> <jaeg...@motorola.com>
 Jaegeuk Kim <jaeg...@kernel.org> <jaegeuk....@samsung.com>
+Jaegeuk Kim <jaeg...@kernel.org> <jaeg...@motorola.com>
 Jakub Kicinski <k...@kernel.org> <jakub.kicin...@netronome.com>
 James Bottomley <jejb@mulgrave.(none)>
 James Bottomley <j...@titanic.il.steeleye.com>
 James E Wilson <wil...@specifix.com>
-James Hogan <jho...@kernel.org> <james.ho...@imgtec.com>
 James Hogan <jho...@kernel.org> <ja...@albanarts.com>
+James Hogan <jho...@kernel.org> <james.ho...@imgtec.com>
 James Ketrenos <jketreno@io.(none)>
 Jan Glauber <jan.glau...@gmail.com> <j...@de.ibm.com>
 Jan Glauber <jan.glau...@gmail.com> <j...@linux.vnet.ibm.com>
 Jan Glauber <jan.glau...@gmail.com> <jglau...@cavium.com>
 Jason Gunthorpe <j...@ziepe.ca> <j...@mellanox.com>
 Jason Gunthorpe <j...@ziepe.ca> <jguntho...@obsidianresearch.com>
-Javi Merino <javi.mer...@kernel.org> <javi.mer...@arm.com>
 <jav...@osg.samsung.com> <javier.marti...@collabora.co.uk>
+Javi Merino <javi.mer...@kernel.org> <javi.mer...@arm.com>
 Jayachandran C <c.jayachand...@gmail.com> <jayachandr...@netlogicmicro.com>
 Jayachandran C <c.jayachand...@gmail.com> <jchan...@broadcom.com>
 Jayachandran C <c.jayachand...@gmail.com> <jchan...@digeo.com>
 Jayachandran C <c.jayachand...@gmail.com> <jn...@caviumnetworks.com>
-Jean Tourrilhes <j...@hpl.hp.com>
 <jean-phili...@linaro.org> <jean-philippe.bruc...@arm.com>
+Jean Tourrilhes <j...@hpl.hp.com>
 Jeff Garzik <jgar...@pretzel.yyz.us>
-Jeff Layton <jlay...@kernel.org> <jlay...@redhat.com>
 Jeff Layton <jlay...@kernel.org> <jlay...@poochiereds.net>
 Jeff Layton <jlay...@kernel.org> <jlay...@primarydata.com>
+Jeff Layton <jlay...@kernel.org> <jlay...@redhat.com>
 Jens Axboe <ax...@suse.de>
 Jens Osterkamp <jens.osterk...@de.ibm.com>
 Johan Hovold <jo...@kernel.org> <jhov...@gmail.com>
@@ -147,27 +151,27 @@ Kay Sievers <kay.siev...@vrfy.org>
 Kenneth W Chen <kenneth.w.c...@intel.com>
 Konstantin Khlebnikov <koc...@gmail.com> <k.khlebni...@samsung.com>
 Koushik <raghavendra.kous...@neterion.com>
-Krzysztof Kozlowski <k...@kernel.org> <k.kozlow...@samsung.com>
 Krzysztof Kozlowski <k...@kernel.org> <k.kozlowsk...@gmail.com>
+Krzysztof Kozlowski <k...@kernel.org> <k.kozlow...@samsung.com>
 Kuninori Morimoto <kuninori.morimoto...@renesas.com>
-Leon Romanovsky <l...@kernel.org> <l...@leon.nu>
-Leon Romanovsky <l...@kernel.org> <leo...@mellanox.com>
 Leonardo Bras <leobra...@gmail.com> <leona...@linux.ibm.com>
 Leonid I Ananiev <leonid.i.anan...@intel.com>
+Leon Romanovsky <l...@kernel.org> <l...@leon.nu>
+Leon Romanovsky <l...@kernel.org> <leo...@mellanox.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>
-Li Yang <leoyang...@nxp.com> <l...@zh-kernel.org>
+Linus Lüssing <linus.luess...@c0d3.blue> <linus.luess...@web.de>
 Li Yang <leoyang...@nxp.com> <le...@freescale.com>
+Li Yang <leoyang...@nxp.com> <l...@zh-kernel.org>
 Lukasz Luba <lukasz.l...@arm.com> <l.l...@partner.samsung.com>
 Maciej W. Rozycki <ma...@mips.com> <ma...@imgtec.com>
-Marc Zyngier <m...@kernel.org> <marc.zyng...@arm.com>
 Marcin Nowakowski <marcin.nowakow...@mips.com> <marcin.nowakow...@imgtec.com>
+Marc Zyngier <m...@kernel.org> <marc.zyng...@arm.com>
 Mark Brown <broo...@sirena.org.uk>
 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>
 Martin Kepplinger <mart...@posteo.de> <martin.kepplin...@puri.sm>
+Martin Kepplinger <mart...@posteo.de> <martin.kepplin...@theobroma-systems.com>
 Mathieu Othacehe <m.othac...@gmail.com>
 Matthew Wilcox <wi...@infradead.org> <matthew.r.wil...@intel.com>
 Matthew Wilcox <wi...@infradead.org> <matt...@wil.cx>
@@ -177,17 +181,17 @@ Matthew Wilcox <wi...@infradead.org> <wi...@debian.org>
 Matthew Wilcox <wi...@infradead.org> <wi...@linux.intel.com>
 Matthew Wilcox <wi...@infradead.org> <wi...@parisc-linux.org>
 Matthieu CASTET <castet.matth...@free.fr>
-Mauro Carvalho Chehab <mche...@kernel.org> <mche...@brturbo.com.br>
+Matt Ranostay <matt.ranos...@konsulko.com> <matt@ranostay.consulting>
+Matt Ranostay <mranos...@gmail.com> Matthew Ranostay 
<mranos...@embeddedalley.com>
+Matt Ranostay <mranos...@gmail.com> <matt.ranos...@intel.com>
+Matt Redfearn <matt.redfe...@mips.com> <matt.redfe...@imgtec.com>
 Mauro Carvalho Chehab <mche...@kernel.org> <mauroche...@gmail.com>
+Mauro Carvalho Chehab <mche...@kernel.org> <mche...@brturbo.com.br>
 Mauro Carvalho Chehab <mche...@kernel.org> <mche...@infradead.org>
+Mauro Carvalho Chehab <mche...@kernel.org> <mche...@osg.samsung.com>
 Mauro Carvalho Chehab <mche...@kernel.org> <mche...@redhat.com>
 Mauro Carvalho Chehab <mche...@kernel.org> <m.che...@samsung.com>
-Mauro Carvalho Chehab <mche...@kernel.org> <mche...@osg.samsung.com>
 Mauro Carvalho Chehab <mche...@kernel.org> <mche...@s-opensource.com>
-Matt Ranostay <mranos...@gmail.com> Matthew Ranostay 
<mranos...@embeddedalley.com>
-Matt Ranostay <mranos...@gmail.com> <matt.ranos...@intel.com>
-Matt Ranostay <matt.ranos...@konsulko.com> <matt@ranostay.consulting>
-Matt Redfearn <matt.redfe...@mips.com> <matt.redfe...@imgtec.com>
 Maxime Ripard <mrip...@kernel.org> <maxime.rip...@bootlin.com>
 Maxime Ripard <mrip...@kernel.org> <maxime.rip...@free-electrons.com>
 Mayuresh Janorkar <ma...@ti.com>
@@ -216,13 +220,13 @@ Paolo 'Blaisorblade' Giarrusso <blaisorbl...@yahoo.it>
 Patrick Mochel <moc...@digitalimplant.org>
 Paul Burton <paulbur...@kernel.org> <paul.bur...@imgtec.com>
 Paul Burton <paulbur...@kernel.org> <paul.bur...@mips.com>
+Paul E. McKenney <paul...@kernel.org> <paul.mcken...@linaro.org>
 Paul E. McKenney <paul...@kernel.org> <paul...@linux.ibm.com>
 Paul E. McKenney <paul...@kernel.org> <paul...@linux.vnet.ibm.com>
-Paul E. McKenney <paul...@kernel.org> <paul.mcken...@linaro.org>
 Paul E. McKenney <paul...@kernel.org> <paul...@us.ibm.com>
 Peter A Jonsson <p...@ludd.ltu.se>
-Peter Oruba <pe...@oruba.de>
 Peter Oruba <peter.or...@amd.com>
+Peter Oruba <pe...@oruba.de>
 Pratyush Anand <pratyush.an...@gmail.com> <pratyush.an...@st.com>
 Praveen BP <pravee...@ti.com>
 Punit Agrawal <punitagra...@gmail.com> <punit.agra...@arm.com>
@@ -235,23 +239,23 @@ Ralf Baechle <r...@linux-mips.org>
 Ralf Wildenhues <ralf.wildenh...@gmx.de>
 Randy Dunlap <rdun...@infradead.org> <rdun...@xenotime.net>
 Rémi Denis-Courmont <rde...@simphalempin.com>
-Ricardo Ribalda <riba...@kernel.org> <ricardo.riba...@gmail.com>
 Ricardo Ribalda <riba...@kernel.org> <rica...@ribalda.com>
 Ricardo Ribalda <riba...@kernel.org> Ricardo Ribalda Delgado 
<riba...@kernel.org>
+Ricardo Ribalda <riba...@kernel.org> <ricardo.riba...@gmail.com>
 Ross Zwisler <zwis...@kernel.org> <ross.zwis...@linux.intel.com>
 Rudolf Marek <r.ma...@sh.cvut.cz>
 Rui Saraiva <r...@joel.ist.utl.pt>
 Sachin P Sant <ss...@in.ibm.com>
-Sarangdhar Joshi <spjo...@codeaurora.org>
+Sakari Ailus <sakari.ai...@linux.intel.com> <sakari.ai...@iki.fi>
 Sam Ravnborg <s...@mars.ravnborg.org>
-Santosh Shilimkar <ssant...@kernel.org>
 Santosh Shilimkar <santosh.shilim...@oracle.org>
+Santosh Shilimkar <ssant...@kernel.org>
+Sarangdhar Joshi <spjo...@codeaurora.org>
 Sascha Hauer <s.ha...@pengutronix.de>
 S.Çağlar Onur <cag...@pardus.org.tr>
-Sakari Ailus <sakari.ai...@linux.intel.com> <sakari.ai...@iki.fi>
 Sean Nyekjaer <s...@geanix.com> <sean.nyekj...@prevas.dk>
-Sebastian Reichel <s...@kernel.org> <s...@debian.org>
 Sebastian Reichel <s...@kernel.org> <sebastian.reic...@collabora.co.uk>
+Sebastian Reichel <s...@kernel.org> <s...@debian.org>
 Sedat Dilek <sedat.di...@gmail.com> <sedat.di...@credativ.de>
 Shiraz Hashim <shiraz.linux.ker...@gmail.com> <shiraz.has...@st.com>
 Shuah Khan <sh...@kernel.org> <shuahk...@gmail.com>
@@ -262,18 +266,21 @@ Simon Arlott <si...@octiron.net> <si...@fire.lp0.eu>
 Simon Kelley <si...@thekelleys.org.uk>
 Stéphane Witzmann <stephane.witzm...@ubpmes.univ-bpclermont.fr>
 Stephen Hemminger <shemmin...@osdl.org>
+Steve Wise <larrystevenw...@gmail.com> <sw...@chelsio.com>
+Steve Wise <larrystevenw...@gmail.com> <sw...@opengridcomputing.com>
 Subash Abhinov Kasiviswanathan <subas...@codeaurora.org>
 Subhash Jadavani <subha...@codeaurora.org>
 Sudeep Holla <sudeep.ho...@arm.com> Sudeep KarkadaNagesha 
<sudeep.karkadanage...@arm.com>
 Sumit Semwal <sumit.sem...@ti.com>
+Takashi YOSHII <takashi.yoshii...@renesas.com>
 Tejun Heo <hte...@gmail.com>
 Thomas Graf <tg...@suug.ch>
 Thomas Pedersen <t...@codeaurora.org>
 Tiezhu Yang <yangtie...@loongson.cn> <kernelpa...@126.com>
 Todor Tomov <todor....@gmail.com> <todor.to...@linaro.org>
 Tony Luck <tony.l...@intel.com>
-TripleX Chung <xxx....@gmail.com> <zhon...@18mail.cn>
 TripleX Chung <xxx....@gmail.com> <trip...@zh-kernel.org>
+TripleX Chung <xxx....@gmail.com> <zhon...@18mail.cn>
 Tsuneo Yoshioka <tsuneo.yoshi...@f-secure.com>
 Uwe Kleine-König <uklei...@informatik.uni-freiburg.de>
 Uwe Kleine-König <u...@pengutronix.de>
@@ -282,22 +289,15 @@ Valdis Kletnieks <valdis.kletni...@vt.edu>
 Vinod Koul <vk...@kernel.org> <vinod.k...@intel.com>
 Vinod Koul <vk...@kernel.org> <vinod.k...@linux.intel.com>
 Vinod Koul <vk...@kernel.org> <vk...@infradead.org>
+Viresh Kumar <vire...@kernel.org> <viresh.kum...@arm.com>
 Viresh Kumar <vire...@kernel.org> <viresh.ku...@st.com>
 Viresh Kumar <vire...@kernel.org> <viresh.li...@gmail.com>
-Viresh Kumar <vire...@kernel.org> <viresh.kum...@arm.com>
 Vivien Didelot <vivien.dide...@gmail.com> <vivien.dide...@savoirfairelinux.com>
 Vlad Dogaru <ddv...@gmail.com> <vlad.dog...@intel.com>
-Vladimir Davydov <vdavydov....@gmail.com> <vdavy...@virtuozzo.com>
 Vladimir Davydov <vdavydov....@gmail.com> <vdavy...@parallels.com>
-Takashi YOSHII <takashi.yoshii...@renesas.com>
+Vladimir Davydov <vdavydov....@gmail.com> <vdavy...@virtuozzo.com>
 Will Deacon <w...@kernel.org> <will.dea...@arm.com>
-Wolfram Sang <w...@kernel.org> <w...@the-dreams.de>
 Wolfram Sang <w...@kernel.org> <w.s...@pengutronix.de>
+Wolfram Sang <w...@kernel.org> <w...@the-dreams.de>
 Yakir Yang <kuankua...@gmail.com> <y...@rock-chips.com>
 Yusuke Goda <goda.yus...@renesas.com>
-Gustavo Padovan <gust...@las.ic.unicamp.br>
-Gustavo Padovan <pado...@profusion.mobi>
-Changbin Du <changbin...@intel.com> <changbin...@intel.com>
-Changbin Du <changbin...@intel.com> <changbin...@gmail.com>
-Steve Wise <larrystevenw...@gmail.com> <sw...@chelsio.com>
-Steve Wise <larrystevenw...@gmail.com> <sw...@opengridcomputing.com>
-- 
2.25.1