From fa0dcb3fe2ca3d51b8a9485e8a23fa70ecc8ba7e Mon Sep 17 00:00:00 2001 From: Daniel Borkmann <daniel@iogearbox.net> Date: Wed, 10 Apr 2019 11:07:14 +0200 Subject: [PATCH] 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> --- .mailmap | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.mailmap b/.mailmap index 37e1847c79886..e7984bb6b4b07 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> -- GitLab