aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorDaniel Borkmann <daniel@iogearbox.net>2019-04-10 09:07:14 (GMT)
committerDaniel Borkmann <daniel@iogearbox.net>2019-04-11 08:19:20 (GMT)
commitfa0dcb3fe2ca3d51b8a9485e8a23fa70ecc8ba7e (patch)
tree11387b8ef4e66a3b5c526ac11cb98b21fb554390 /.mailmap
parent50bd645b3a21a374dbd0fa8273a5f4e98001fb05 (diff)
downloadkernel_replicant_linux-fa0dcb3fe2ca3d51b8a9485e8a23fa70ecc8ba7e.zip
kernel_replicant_linux-fa0dcb3fe2ca3d51b8a9485e8a23fa70ecc8ba7e.tar.gz
kernel_replicant_linux-fa0dcb3fe2ca3d51b8a9485e8a23fa70ecc8ba7e.tar.bz2
mailmap: add entry for email addresses
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: Daniel Borkmann <daniel@iogearbox.net> Acked-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap9
1 files changed, 9 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 37e1847..e7984bb 100644
--- a/.mailmap
+++ b/.mailmap
@@ -16,6 +16,9 @@ Alan Cox <alan@lxorguk.ukuu.org.uk>
Alan Cox <root@hraefn.swansea.linux.org.uk>
Aleksey Gorelov <aleksey_gorelov@phoenix.com>
Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
+Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
+Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
+Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
Al Viro <viro@ftp.linux.org.uk>
Al Viro <viro@zenIV.linux.org.uk>
Andi Shyti <andi@etezian.org> <andi.shyti@samsung.com>
@@ -46,6 +49,12 @@ Christoph Hellwig <hch@lst.de>
Christophe Ricard <christophe.ricard@gmail.com>
Corey Minyard <minyard@acm.org>
Damian Hobson-Garcia <dhobsong@igel.co.jp>
+Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com>
+Daniel Borkmann <daniel@iogearbox.net> <dborkmann@redhat.com>
+Daniel Borkmann <daniel@iogearbox.net> <danborkmann@iogearbox.net>
+Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch>
+Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>
+Daniel Borkmann <daniel@iogearbox.net> <dxchgb@gmail.com>
David Brownell <david-b@pacbell.net>
David Woodhouse <dwmw2@shinybook.infradead.org>
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>