summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorJiri Pirko <jiri@resnulli.us>2023-03-09 12:49:11 +0100
committerJakub Kicinski <kuba@kernel.org>2023-03-11 03:11:48 +0100
commit71582371a5ee09272b4b4b0a07fa6eb78c9d2f90 (patch)
treef07c55b49b58811d4372101ec9052bd7026a9937 /.mailmap
parentMerge branch 'add-checking-sq-is-full-inside-xdp-xmit' (diff)
downloadlinux-71582371a5ee09272b4b4b0a07fa6eb78c9d2f90.tar.xz
linux-71582371a5ee09272b4b4b0a07fa6eb78c9d2f90.zip
MAINTAINERS: make my email address consistent
Use jiri@resnulli.us in all MAINTAINERS entries and fixup .mailmap so all other addresses point to that one. Signed-off-by: Jiri Pirko <jiri@resnulli.us> Link: https://lore.kernel.org/r/20230309114911.923460-1-jiri@resnulli.us Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap3
1 files changed, 3 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 66754ca6656d..438d79c27717 100644
--- a/.mailmap
+++ b/.mailmap
@@ -210,6 +210,9 @@ Jens Axboe <axboe@suse.de>
Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
Jernej Skrabec <jernej.skrabec@gmail.com> <jernej.skrabec@siol.net>
Jessica Zhang <quic_jesszhan@quicinc.com> <jesszhan@codeaurora.org>
+Jiri Pirko <jiri@resnulli.us> <jiri@nvidia.com>
+Jiri Pirko <jiri@resnulli.us> <jiri@mellanox.com>
+Jiri Pirko <jiri@resnulli.us> <jpirko@redhat.com>
Jiri Slaby <jirislaby@kernel.org> <jirislaby@gmail.com>
Jiri Slaby <jirislaby@kernel.org> <jslaby@novell.com>
Jiri Slaby <jirislaby@kernel.org> <jslaby@suse.com>