Without having first read the git-shortlog man-page, the format
of .mailmap may not be immediately obvious. Add comments with pointers
to the man-page, along with other details.
Signed-off-by: NKees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/r/202008080013.58EBD83@keescookSigned-off-by: NJonathan Corbet <corbet@lwn.net>

My Marvell account has been suspended, map the address to my private mail.
Signed-off-by: NAlexander Lobakin <alobakin@pm.me>
Link: https://lore.kernel.org/r/9xzFiqHAFGYuKfUycRaCQSIgsqmeL9E9SA3lSoqOMUPhFVaAgSgvukCUWO7iRbjtiUrFjK46fhu7dJ5TaCv1EjaNFm5yF_H3y5S1s_QALCA=@pm.meSigned-off-by: NJonathan Corbet <corbet@lwn.net>

Add an entry to correct my email addresses.
Signed-off-by: NMike Rapoport <rppt@linux.ibm.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Link: http://lkml.kernel.org/r/20200708095414.12275-1-rppt@kernel.orgSigned-off-by: NLinus Torvalds <torvalds@linux-foundation.org>

Signed-off-by: NGerald Schaefer <gerald.schaefer@linux.ibm.com>
Signed-off-by: NHeiko Carstens <hca@linux.ibm.com>

Signed-off-by: NHeiko Carstens <hca@linux.ibm.com>

Map old corporate email address @yandex-team.ru to stable private address.
Signed-off-by: NKonstantin Khlebnikov <koct9i@gmail.com>
Link: https://lore.kernel.org/r/159360469186.24918.10108157093572183535.stgit@zurgSigned-off-by: NJonathan Corbet <corbet@lwn.net>

There were enough problems with suse.{com,cz} MTAs recently. I am bored
by restoring lost e-mails from public archives. Let's switch (all) my
MAINTAINERS addresses to @kernel.org and forward the e-mails there as I
wish.

And add the whole history to .mailmap.
Signed-off-by: NJiri Slaby <jslaby@suse.cz>
Cc: Joe Perches <joe@perches.com>

Link: https://lore.kernel.org/r/20200623080919.19976-1-jslaby@suse.czSigned-off-by: NJonathan Corbet <corbet@lwn.net>

My D-Link and Yandex addresses don't exist anymore, map them to my
private box.
Signed-off-by: NAlexander Lobakin <alobakin@pm.me>
Link: https://lore.kernel.org/r/5YUtoWlS7NX1N6TxI4ddZ9V-Yx8Bn8wzrEVJqfkTuwEzZjAsJg157goV81xPAU76k84Nis2uBwdHWk4JmYHbvGmd_JcBTk-rZDVpFNPNolU=@pm.meSigned-off-by: NJonathan Corbet <corbet@lwn.net>

Modify  emails to ribalda@kernel.org and unify my surname in all the
files.
Signed-off-by: NRicardo Ribalda <ribalda@kernel.org>
Link: https://lore.kernel.org/r/20200430135224.362700-1-ricardo@ribalda.comSigned-off-by: NJonathan Corbet <corbet@lwn.net>

The old email is still active, but for easier handling, I am going to
use my kernel.org address from now on. Also, add a mailmap for the now
defunct Pengutronix address.
Signed-off-by: NWolfram Sang <wsa@kernel.org>

Add an entry to connect my email addresses.
Signed-off-by: NLeonardo Bras <leobras.c@gmail.com>
Link: https://lore.kernel.org/r/20200428024439.215806-1-leobras.c@gmail.comSigned-off-by: NJonathan Corbet <corbet@lwn.net>

I do not longer work for credativ Germany.

Please, use my private email address instead.

This is for the case when people want to CC me on
patches sent from my old business email address.
Signed-off-by: NSedat Dilek <sedat.dilek@gmail.com>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>

For security reasons I stopped using gmail account and kernel address is
now up-to-date alias to my personal address.

People periodically send me emails to address which they found in source
code of drivers, so this change reflects state where people can contact
me.

[ Added .mailmap entry as per Joe Perches  - Linus ]
Signed-off-by: NPali Rohár <pali@kernel.org>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Joe Perches <joe@perches.com>
Link: http://lkml.kernel.org/r/20200307104237.8199-1-pali@kernel.orgSigned-off-by: NLinus Torvalds <torvalds@linux-foundation.org>

Add entry for my @iki.fi e-mail address to the mailmap.
Signed-off-by: NSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: NMauro Carvalho Chehab <mchehab+huawei@kernel.org>

My Netronome address is no longer active. I am no maintainer, but
get_maintainer.pl sometimes returns my name for a small number of
files (BPF-related). Add an entry to .mailmap for good measure.
Signed-off-by: NQuentin Monnet <quentin@isovalent.com>
Signed-off-by: NDaniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/20200226171353.18982-1-quentin@isovalent.comSigned-off-by: NAlexei Starovoitov <ast@kernel.org>

Add an entry to connect all my email addresses.
Signed-off-by: NTiezhu Yang <yangtiezhu@loongson.cn>
Link: https://lore.kernel.org/r/1580721045-4988-1-git-send-email-yangtiezhu@loongson.cnSigned-off-by: NJonathan Corbet <corbet@lwn.net>

[ paulmck: Apply Florian Fainelli feedback. ]
Signed-off-by: NPaul E. McKenney <paulmck@kernel.org>

I will lose access to my @arm.com email address next week, so
let's update the MAINTAINERS file and map it correctly in
.mailmap
Signed-off-by: NAndrew Murray <andrew.murray@arm.com>
Signed-off-by: NLorenzo Pieralisi <lorenzo.pieralisi@arm.com>

My Netronome email address may become inactive soon.
Signed-off-by: NJakub Kicinski <kuba@kernel.org>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>

The Erik's last name and email address have changed recently,
so update MAINTAINERS and .mailmap to reflect that change.
Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>

The old email address I contributed to the kernel from in the past
has not been functional for a few years, so add a .mailmap entry
for it.
Signed-off-by: NRafael J. Wysocki <rjw@rjwysocki.net>

I no longer work at Savoir-faire Linux but even though MAINTAINERS is
up-to-date, some emails are still sent to my old email address.
Signed-off-by: NVivien Didelot <vivien.didelot@gmail.com>
Signed-off-by: NJakub Kicinski <jakub.kicinski@netronome.com>

Update my e-mail address to @samsung.com in maintainers.
Add also map in .mailmap to new e-mail.
Signed-off-by: NKamil Konieczny <k.konieczny@samsung.com>
Signed-off-by: NHerbert Xu <herbert@gondor.apana.org.au>

Free Electrons is now Bootlin.

Link: https://lore.kernel.org/r/20191210134653.2995661-1-alexandre.belloni@bootlin.comSigned-off-by: NAlexandre Belloni <alexandre.belloni@bootlin.com>

Signed-off-by: NSteve Wise <larrystevenwise@gmail.com>
Link: https://lore.kernel.org/r/20191203020319.15036-1-larrystevenwise@gmail.comSigned-off-by: NDoug Ledford <dledford@redhat.com>

Update Lukasz Luba's email address to @arm.com in MAINTAINERS and map it
correctly in .mailmap file.
Signed-off-by: NLukasz Luba <lukasz.luba@arm.com>
Signed-off-by: NKrzysztof Kozlowski <krzk@kernel.org>

Remove my maintainer entries for ThunderX drivers as I'm moving on
and won't have access to ThunderX hardware anymore and add Robert.
Also remove the obsolete addresses of David Daney and Steven Hill.

Add an entry to .mailmap for my various email addresses.

Link: https://lore.kernel.org/r/20191119190436.17875-2-rrichter@marvell.com
Cc: Ganapatrao Prabhakerrao Kulkarni <gkulkarni@marvell.com>
Cc: soc@kernel.org
Signed-off-by: NJan Glauber <jglauber@marvell.com>
Signed-off-by: NRobert Richter <rrichter@marvell.com>
Signed-off-by: NOlof Johansson <olof@lixom.net>

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: NArd Biesheuvel <ardb@kernel.org>

jnair is no longer at caviumnetworks.com (or at marvell.com). This also
means that Cavium ThunderX2 will now be maintained by Robert.

This is probably a good time to map various email addresses used for
my patches to my personal email ID, update .mailmap to do this.

Link: https://lore.kernel.org/r/20191106035203.5389-1-c.jayachandran@gmail.comSigned-off-by: NJayachandran C <c.jayachandran@gmail.com>
Acked-by: NRobert Richter <rrichter@marvell.com>
Signed-off-by: NOlof Johansson <olof@lixom.net>

Switch to using my paulburton@kernel.org email address in order to avoid
subject mangling that's being imposed on my previous address.
Signed-off-by: NPaul Burton <paul.burton@mips.com>
Signed-off-by: NPaul Burton <paulburton@kernel.org>
Cc: linux-kernel@vger.kernel.org

Add replacement email address for the one on my expired domain.
Signed-off-by: NSimon Arlott <simon@octiron.net>
Signed-off-by: NStefan Wahren <wahrenst@gmx.net>

Include my new email address for tracking my contributions.
Signed-off-by: NMartin Kepplinger <martin.kepplinger@puri.sm>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

My @arm.com email address will stop working in a few weeks, so add an
entry to .mailmap so others have a way to reach me if they want to.

While at it, move some entries around to keep the file in alphabetical
order.
Signed-off-by: NQuentin Perret <quentin.perret@arm.com>
Acked-by: NWill Deacon <will@kernel.org>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

This commit replaces my company's email address with a stable private
address.
Signed-off-by: NKurt Van Dijck <dev.kurt@vandijck-laurijssen.be>
Signed-off-by: NOleksij Rempel <o.rempel@pengutronix.de>
Acked-by: NOliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: NMarc Kleine-Budde <mkl@pengutronix.de>

I don't work for Virtuozzo or Samsung anymore and I've noticed that they
have started sending annoying html email-replies.

And I prioritize my personal emails over work email box, so while at it
add an entry for Arista too - so I can reply faster when needed.

Link: http://lkml.kernel.org/r/20190827220346.11123-1-dima@arista.comSigned-off-by: NDmitry Safonov <dima@arista.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>

Map my old email address @atmel.com to my new company name. It happened 3
years ago but I realized the existence of this file recently.
Signed-off-by: NNicolas Ferre <nicolas.ferre@microchip.com>
Link: https://lore.kernel.org/r/20190823083158.2649-3-nicolas.ferre@microchip.comSigned-off-by: NAlexandre Belloni <alexandre.belloni@bootlin.com>

Add entry to connect all Jaegeuk's email addresses.
Acked-by: NJaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: NChao Yu <yuchao0@huawei.com>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

My @linaro.org email address doesn't exist anymore so add a
mailmap entry to map it to my @gmail.com address.
Signed-off-by: NTodor Tomov <todor.too@gmail.com>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

Add entry to connect all Gao Xiang's email addresses.
Signed-off-by: NChao Yu <yuchao0@huawei.com>
Acked-by: NGao Xiang <gaoxiang25@huawei.com>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

I've used several email accounts to contribute codes, samsung's one
is obsolete, so let me add entry to map them, in order to let people
find me easily when they blame my codes.
Signed-off-by: NChao Yu <yuchao0@huawei.com>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>