Commit fa0dcb3f authored by Daniel Borkmann's avatar Daniel Borkmann
Browse files

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: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 50bd645b

.mailmap

+9 −0
Original line number Diff line number Diff line
@@ -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>

CRA Git | Maintained and supported by SUSTech CRA and CCSE