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

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>

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>

Change my first name spelling from Deng-Cheng to Dengcheng.

Update email addresses.
Signed-off-by: NDengcheng Zhu <dzhu@wavecomp.com>
Signed-off-by: NPaul Burton <paul.burton@mips.com>
Cc: linux-mips@linux-mips.org

Use my korg address instead of the bootlin one.
Signed-off-by: NBoris Brezillon <boris.brezillon@bootlin.com>

As I'll no longer be working with Arm, add a mailmap entry so any mail
directed towards me reaches the appropriate mailbox.
Acked-by: NWill Deacon <will.deacon@arm.com>
Signed-off-by: NPunit Agrawal <punit.agrawal@arm.com>
Signed-off-by: NCatalin Marinas <catalin.marinas@arm.com>

I have had various email addresses and a name change after marriage.

Link: http://lkml.kernel.org/r/20181009125207.6096-1-o.rempel@pengutronix.deSigned-off-by: NOleksij Rempel <o.rempel@pengutronix.de>
Cc: Jiri Kosina <trivial@kernel.org>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>

Redirect some older email addresses that are in the git logs.
Signed-off-by: NMatthew Wilcox <willy@infradead.org>

Since my @wdc.com e-mail address will become invalid after Friday
August 24th, change it into an e-mail address that will remain valid
after that date.
Signed-off-by: NBart Van Assche <bart.vanassche@wdc.com>
Signed-off-by: NJason Gunthorpe <jgg@mellanox.com>

Signed-off-by: NJeff Layton <jlayton@kernel.org>

Redirect email to my @kernel.org account.
Signed-off-by: NRoss Zwisler <ross.zwisler@linux.intel.com>
Signed-off-by: NDave Jiang <dave.jiang@intel.com>

Update the email address for compressed audio maintainer
Also update .mailmap.
Signed-off-by: NVinod Koul <vkoul@kernel.org>
Signed-off-by: NMark Brown <broonie@kernel.org>

Because I will be leaving Samsung soon, update my e-mail address
to andi@etezian.org

For reachability update also mailcap.

CC: Krzysztof Kozlowski <krzk@kernel.org>
CC: Kukjin Kim <kgene@kernel.org>
CC: linux-samsung-soc@vger.kernel.org
Signed-off-by: NAndi Shyti <andi.shyti@samsung.com>
Signed-off-by: NMark Brown <broonie@kernel.org>

As now Free Electrons is Bootlin.
Signed-off-by: NGregory CLEMENT <gregory.clement@bootlin.com>

Update .mailmap file to point to my primary open-source
related e-mail address.
Signed-off-by: NLeon Romanovsky <leonro@mellanox.com>
Signed-off-by: NJason Gunthorpe <jgg@mellanox.com>

Free Electrons is now Bootlin.
Signed-off-by: NBoris Brezillon <boris.brezillon@bootlin.com>

Free Electrons is now Bootlin.
Signed-off-by: NMiquel Raynal <miquel.raynal@bootlin.com>
Signed-off-by: NBoris Brezillon <boris.brezillon@bootlin.com>

Change the previous employers email addresses to the current email
address.

Link: http://lkml.kernel.org/r/20171229121726.31589-1-jeffy.chen@rock-chips.comSigned-off-by: NJeffy Chen <jeffy.chen@rock-chips.com>
Acked-by: NMartin Kepplinger <martink@posteo.de>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>