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>

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>

Use my kernel.org address instead of the bootlin one.
Signed-off-by: NMaxime Ripard <maxime.ripard@bootlin.com>

Update MAINTAINERS and .mailmap with my @linaro.org address, since I
don't have access to my @arm.com address anymore.
Signed-off-by: NJean-Philippe Brucker <jean-philippe@linaro.org>
Signed-off-by: NWill Deacon <will@kernel.org>

My @arm.com address will stop working in a couple of weeks. Update
MAINTAINERS and .mailmap files with an address I'll have access to.
Signed-off-by: NJulien Thierry <julien.thierry@arm.com>
Signed-off-by: NWill Deacon <will@kernel.org>

I will soon lose access to my @arm.com email address, so let's
update the MAINTAINERS file to point to my @kernel.org address,
as well as .mailmap for good measure.

Note that my @arm.com address will still work, but someone else
will be reading whatever is sent there. Don't say you didn't know!
Signed-off-by: NMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: NWill Deacon <will@kernel.org>

The @linaro.org address is not working and bonucing, so update the
references.
Signed-off-by: NHanjun Guo <guohanjun@huawei.com>
Signed-off-by: NWill Deacon <will.deacon@arm.com>

My @arm.com address will stop working at the end of August, so update to
my @kernel.org address where you'll still be able to reach me.

When I say "stop working" I really mean "will go to my line manager", so
send patches there at your peril because they may reply with roadmaps
and spreadsheets. You have been warned.

Cc: Will Deacon <will@kernel.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: "Paul E . McKenney" <paulmck@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: arm-soc <arm@kernel.org>
Signed-off-by: NWill Deacon <will.deacon@arm.com>

Redirect email addresses from git log to the mainly used ones
for Alexei and myself such that it is consistent with the ones
in MAINTAINERS file. Useful in particular when git mailmap is
enabled on broader scope, for example:

  $ git config --global log.mailmap true
Signed-off-by: NDaniel Borkmann <daniel@iogearbox.net>
Acked-by: NAlexei Starovoitov <ast@kernel.org>

As I'll no longer be working with Prevas, add a mailmap entry so
any mail directed towards me reaches the appropriate mailbox.
Signed-off-by: NSean Nyekjaer <sean@geanix.com>
Signed-off-by: NJonathan Cameron <Jonathan.Cameron@huawei.com>

The @linaro version won't be valid much longer.
Signed-off-by: NNicolas Pitre <nico@fluxnic.net>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>

Add my email in the mailmap file to have a consistent shortlog output.

Link: http://lkml.kernel.org/r/20190308142103.4929-1-changbin.du@gmail.comSigned-off-by: NChangbin Du <changbin.du@gmail.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>

I am not working for Intel or Linaro, so udpate the email address.
Signed-off-by: NAlex Shi <alex.shi@linux.alibaba.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Li Yang <leoyang.li@nxp.com>
Signed-off-by: NWeiwei Jia <harryxiyou@gmail.com>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

triplex@zh-kernel.org and zhongyu@18mail.cn is absolete email address
for TripleX Chung <xxx.phy@gmail.com>
Signed-off-by: NAlex Shi <alex.shi@linux.alibaba.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: TripleX Chung <xxx.phy@gmail.com>
Signed-off-by: NWeiwei Jia <harryxiyou@gmail.com>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

Update the obsolete email address leoli@freescale.com and
leo@zh-kernel.org with leoyang.li@nxp.com.
Signed-off-by: NAlex Shi <alex.shi@linux.alibaba.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Li Yang <leoyang.li@nxp.com>
Signed-off-by: NWeiwei Jia <harryxiyou@gmail.com>
Signed-off-by: NJonathan Corbet <corbet@lwn.net>

Some contributions appears as Mathieu Othacehe and other as Mathieu
OTHACEHE.
Signed-off-by: NMathieu Othacehe <m.othacehe@gmail.com>
Signed-off-by: NMark Brown <broonie@kernel.org>