xref: /freebsd/sys/contrib/openzfs/.mailmap (revision e6e941e659ab7b3db6786103c1cdc30735a82e32)
1# This file maps the name+email seen in a commit back to a canonical
2# name+email. Git will replace the commit name/email with the canonical version
3# wherever it sees it.
4#
5# If there is a commit in the history with a "wrong" name or email, list it
6# here. If you regularly commit with an alternate name or email address and
7# would like to ensure that you are always listed consistently in the repo, add
8# mapping here.
9#
10# On the other hand, if you use multiple names or email addresses legitimately
11# (eg you use a company email address for your paid OpenZFS work, and a
12# personal address for your evening side projects), then don't map one to the
13# other here.
14#
15# The most common formats are:
16#
17# Canonical Name <canonical-email>
18# Canonical Name <canonical-email> <commit-email>
19# Canonical Name <canonical-email> Commit Name <commit-email>
20#
21# See https://git-scm.com/docs/gitmailmap for more info.
22
23# These maps are making names consistent where they have varied but the email
24# address has never changed. In most cases, the full name is in the
25# Signed-off-by of a commit with a matching author.
26Achill Gilgenast <achill@achill.org>
27Ahelenia Ziemiańska <nabijaczleweli@gmail.com>
28Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
29Alex John <alex@stty.io>
30Andreas Dilger <adilger@dilger.ca>
31Andrew Walker <awalker@ixsystems.com>
32Benedikt Neuffer <github@itfriend.de>
33Chengfei Zhu <chengfeix.zhu@intel.com>
34ChenHao Lu <18302010006@fudan.edu.cn>
35Chris Lindee <chris.lindee+github@gmail.com>
36Colm Buckley <colm@tuatha.org>
37Crag Wang <crag0715@gmail.com>
38Damian Szuberski <szuberskidamian@gmail.com>
39Daniel Kolesa <daniel@octaforge.org>
40Debabrata Banerjee <dbavatar@gmail.com>
41Diwakar Kristappagari <diwakar-k@hpe.com>
42Finix Yan <yanchongwen@hotmail.com>
43Gaurav Kumar <gauravk.18@gmail.com>
44Gionatan Danti <g.danti@assyoma.it>
45Glenn Washburn <development@efficientek.com>
46Gordan Bobic <gordan.bobic@gmail.com>
47Gregory Bartholomew <gregory.lee.bartholomew@gmail.com>
48hedong zhang <h_d_zhang@163.com>
49Ilkka Sovanto <github@ilkka.kapsi.fi>
50InsanePrawn <Insane.Prawny@gmail.com>
51Jason Cohen <jwittlincohen@gmail.com>
52Jason Harmening <jason.harmening@gmail.com>
53Jeremy Faulkner <gldisater@gmail.com>
54Jinshan Xiong <jinshan.xiong@gmail.com>
55John Poduska <jpoduska@datto.com>
56Jo Zzsi <jozzsicsataban@gmail.com>
57Justin Scholz <git@justinscholz.de>
58Ka Ho Ng <khng300@gmail.com>
59Kash Pande <github@tripleback.net>
60Kay Pedersen <christianpe96@gmail.com>
61KernelOfTruth <kerneloftruth@gmail.com>
62Liu Hua <liu.hua130@zte.com.cn>
63Liu Qing <winglq@gmail.com>
64loli10K <ezomori.nozomu@gmail.com>
65Mart Frauenlob <allkind@fastest.cc>
66Matthias Blankertz <matthias@blankertz.org>
67Michael Gmelin <grembo@FreeBSD.org>
68Olivier Mazouffre <olivier.mazouffre@ims-bordeaux.fr>
69Piotr Kubaj <pkubaj@anongoth.pl>
70Quentin Zdanis <zdanisq@gmail.com>
71Roberto Ricci <io@r-ricci.it>
72Roberto Ricci <ricci@disroot.org>
73Rob Norris <robn@despairlabs.com>
74Rob Norris <rob.norris@klarasystems.com>
75Sam Lunt <samuel.j.lunt@gmail.com>
76Sanjeev Bagewadi <sanjeev.bagewadi@gmail.com>
77Sebastian Wuerl <s.wuerl@mailbox.org>
78SHENGYI HONG <aokblast@FreeBSD.org>
79Stoiko Ivanov <github@nomore.at>
80Tamas TEVESZ <ice@extreme.hu>
81WHR <msl0000023508@gmail.com>
82Yanping Gao <yanping.gao@xtaotech.com>
83Youzhong Yang <youzhong@gmail.com>
84
85# Signed-off-by: overriding Author:
86Alexander Ziaee <ziaee@FreeBSD.org> <concussious@runbox.com>
87Felix Schmidt <felixschmidt20@aol.com> <f.sch.prototype@gmail.com>
88Jean-Sébastien Pédron <dumbbell@FreeBSD.org> <jean-sebastien.pedron@dumbbell.fr>
89Konstantin Belousov <kib@FreeBSD.org> <kib@kib.kiev.ua>
90Olivier Certner <olce@FreeBSD.org> <olce.freebsd@certner.fr>
91Patrick Xia <patrickx@google.com> <octalc0de@aim.com>
92Phil Sutter <phil@nwl.cc> <p.github@nwl.cc>
93poscat <poscat@poscat.moe> <poscat0x04@outlook.com>
94Qiuhao Chen <chenqiuhao1997@gmail.com> <haohao0924@126.com>
95Ryan <errornointernet@envs.net> <error.nointernet@gmail.com>
96Sietse <sietse@wizdom.nu> <uglymotha@wizdom.nu>
97Yuxin Wang <yuxinwang9999@gmail.com> <Bi11gates9999@gmail.com>
98Zhenlei Huang <zlei@FreeBSD.org> <zlei.huang@gmail.com>
99
100# Commits from strange places, long ago
101Brian Behlendorf <behlendorf1@llnl.gov> <behlendo@7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c>
102Brian Behlendorf <behlendorf1@llnl.gov> <behlendo@fedora-17-amd64.(none)>
103Brian Behlendorf <behlendorf1@llnl.gov> <behlendo@myhost.(none)>
104Brian Behlendorf <behlendorf1@llnl.gov> <ubuntu@ip-172-31-16-145.us-west-1.compute.internal>
105Brian Behlendorf <behlendorf1@llnl.gov> <ubuntu@ip-172-31-20-6.us-west-1.compute.internal>
106Herb Wartens <wartens2@llnl.gov> <wartens2@7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c>
107Ned Bass <bass6@llnl.gov> <bass6@zeno1.(none)>
108Tulsi Jain <tulsi.jain@delphix.com> <tulsi.jain@Tulsi-Jains-MacBook-Pro.local>
109
110# Mappings from Github no-reply addresses
111ajs124 <git@ajs124.de> <ajs124@users.noreply.github.com>
112Alek Pinchuk <apinchuk@axcient.com> <alek-p@users.noreply.github.com>
113Aleksandr Liber <aleksandr.liber@perforce.com> <61714074+AleksandrLiber@users.noreply.github.com>
114Alexander Lobakin <alobakin@pm.me> <solbjorn@users.noreply.github.com>
115Alexey Smirnoff <fling@member.fsf.org> <fling-@users.noreply.github.com>
116Allen Holl <allen.m.holl@gmail.com> <65494904+allen-4@users.noreply.github.com>
117Alphan Yılmaz <alphanyilmaz@gmail.com> <a1ea321@users.noreply.github.com>
118Ameer Hamza <ahamza@ixsystems.com> <106930537+ixhamza@users.noreply.github.com>
119Andrew J. Hesford <ajh@sideband.org> <48421688+ahesford@users.noreply.github.com>>
120Andrew Sun <me@andrewsun.com> <as-com@users.noreply.github.com>
121Aron Xu <happyaron.xu@gmail.com> <happyaron@users.noreply.github.com>
122Arun KV <arun.kv@datacore.com> <65647132+arun-kv@users.noreply.github.com>
123Ben Wolsieffer <benwolsieffer@gmail.com> <lopsided98@users.noreply.github.com>
124bernie1995 <bernie.pikes@gmail.com> <42413912+bernie1995@users.noreply.github.com>
125Bojan Novković <bnovkov@FreeBSD.org> <72801811+bnovkov@users.noreply.github.com>
126Boris Protopopov <boris.protopopov@actifio.com> <bprotopopov@users.noreply.github.com>
127Brad Forschinger <github@bnjf.id.au> <bnjf@users.noreply.github.com>
128Brandon Thetford <brandon@dodecatec.com> <dodexahedron@users.noreply.github.com>
129buzzingwires <buzzingwires@outlook.com> <131118055+buzzingwires@users.noreply.github.com>
130Cedric Maunoury <cedric.maunoury@gmail.com> <38213715+cedricmaunoury@users.noreply.github.com>
131Charles Suh <charles.suh@gmail.com> <charlessuh@users.noreply.github.com>
132Chris Peredun <chris.peredun@ixsystems.com> <126915832+chrisperedun@users.noreply.github.com>
133classabbyamp <dev@placeviolette.net> <5366828+classabbyamp@users.noreply.github.com>
134Dacian Reece-Stremtan <dacianstremtan@gmail.com> <35844628+dacianstremtan@users.noreply.github.com>
135Damian Szuberski <szuberskidamian@gmail.com> <30863496+szubersk@users.noreply.github.com>
136Daniel Hiepler <d-git@coderdu.de> <32984777+heeplr@users.noreply.github.com>
137Daniel Kobras <d.kobras@science-computing.de> <sckobras@users.noreply.github.com>
138Daniel Reichelt <hacking@nachtgeist.net> <nachtgeist@users.noreply.github.com>
139David Quigley <david.quigley@intel.com> <dpquigl@users.noreply.github.com>
140Dennis R. Friedrichsen <dennis.r.friedrichsen@gmail.com> <31087738+dennisfriedrichsen@users.noreply.github.com>
141Dex Wood <slash2314@gmail.com> <slash2314@users.noreply.github.com>
142DHE <git@dehacked.net> <DeHackEd@users.noreply.github.com>
143Dmitri John Ledkov <dimitri.ledkov@canonical.com> <19779+xnox@users.noreply.github.com>
144Dries Michiels <driesm.michiels@gmail.com> <32487486+driesmp@users.noreply.github.com>
145Edmund Nadolski <edmund.nadolski@ixsystems.com> <137826107+ednadolski-ix@users.noreply.github.com>
146Érico Nogueira <erico.erc@gmail.com> <34201958+ericonr@users.noreply.github.com>
147Fedor Uporov <fuporov.vstack@gmail.com> <60701163+fuporovvStack@users.noreply.github.com>
148Felix Dörre <felix@dogcraft.de> <felixdoerre@users.noreply.github.com>
149Felix Neumärker <xdch47@posteo.de> <34678034+xdch47@users.noreply.github.com>
150Finix Yan <yancw@info2soft.com> <Finix1979@users.noreply.github.com>
151Friedrich Weber <f.weber@proxmox.com> <56110206+frwbr@users.noreply.github.com>
152Gaurav Kumar <gauravk.18@gmail.com> <gaurkuma@users.noreply.github.com>
153George Gaydarov <git@gg7.io> <gg7@users.noreply.github.com>
154Georgy Yakovlev <gyakovlev@gentoo.org> <168902+gyakovlev@users.noreply.github.com>
155Gerardwx <gerardw@alum.mit.edu> <Gerardwx@users.noreply.github.com>
156Germano Massullo <germano.massullo@gmail.com> <Germano0@users.noreply.github.com>
157Gian-Carlo DeFazio <defazio1@llnl.gov> <defaziogiancarlo@users.noreply.github.com>
158Giuseppe Di Natale <dinatale2@llnl.gov> <dinatale2@users.noreply.github.com>
159Hajo Möller <dasjoe@gmail.com> <dasjoe@users.noreply.github.com>
160Harry Mallon <hjmallon@gmail.com> <1816667+hjmallon@users.noreply.github.com>
161Hiếu Lê <leorize+oss@disroot.org> <alaviss@users.noreply.github.com>
162Jake Howard <git@theorangeone.net> <RealOrangeOne@users.noreply.github.com>
163James Cowgill <james.cowgill@mips.com> <jcowgill@users.noreply.github.com>
164Jaron Kent-Dobias <jaron@kent-dobias.com> <kentdobias@users.noreply.github.com>
165Jason King <jason.king@joyent.com> <jasonbking@users.noreply.github.com>
166Jeff Dike <jdike@akamai.com> <52420226+jdike@users.noreply.github.com>
167Jitendra Patidar <jitendra.patidar@nutanix.com> <53164267+jsai20@users.noreply.github.com>
168João Carlos Mendes Luís <jonny@jonny.eng.br> <dioni21@users.noreply.github.com>
169John Eismeier <john.eismeier@gmail.com> <32205350+jeis2497052@users.noreply.github.com>
170John L. Hammond <john.hammond@intel.com> <35266395+jhammond-intel@users.noreply.github.com>
171John-Mark Gurney <jmg@funkthat.com> <jmgurney@users.noreply.github.com>
172John Ramsden <johnramsden@riseup.net> <johnramsden@users.noreply.github.com>
173Jonathon Fernyhough <jonathon@m2x.dev> <559369+jonathonf@users.noreply.github.com>
174Jose Luis Duran <jlduran@gmail.com> <jlduran@users.noreply.github.com>
175Justin Hibbits <chmeeedalf@gmail.com> <chmeeedalf@users.noreply.github.com>
176Kaitlin Hoang <kthoang@amazon.com> <khoang98@users.noreply.github.com>
177Kevin Greene <kevin.greene@delphix.com> <104801862+kxgreene@users.noreply.github.com>
178Kevin Jin <lostking2008@hotmail.com> <33590050+jxdking@users.noreply.github.com>
179Kevin P. Fleming <kevin@km6g.us> <kpfleming@users.noreply.github.com>
180Krzysztof Piecuch <piecuch@kpiecuch.pl> <3964215+pikrzysztof@users.noreply.github.com>
181Kyle Evans <kevans@FreeBSD.org> <kevans91@users.noreply.github.com>
182Laurențiu Nicola <lnicola@dend.ro> <lnicola@users.noreply.github.com>
183loli10K <ezomori.nozomu@gmail.com> <loli10K@users.noreply.github.com>
184Lorenz Hüdepohl <dev@stellardeath.org> <lhuedepohl@users.noreply.github.com>
185Luís Henriques <henrix@camandro.org> <73643340+lumigch@users.noreply.github.com>
186Marcin Skarbek <git@skarbek.name> <mskarbek@users.noreply.github.com>
187Matt Fiddaman <github@m.fiddaman.uk> <81489167+matt-fidd@users.noreply.github.com>
188Maxim Filimonov <che@bein.link> <part1zano@users.noreply.github.com>
189Max Zettlmeißl <max@zettlmeissl.de> <6818198+maxz@users.noreply.github.com>
190Michael Niewöhner <foss@mniewoehner.de> <c0d3z3r0@users.noreply.github.com>
191Michael Zhivich <mzhivich@akamai.com> <33133421+mzhivich@users.noreply.github.com>
192MigeljanImeri <ImeriMigel@gmail.com> <78048439+MigeljanImeri@users.noreply.github.com>
193Mo Zhou <cdluminate@gmail.com> <5723047+cdluminate@users.noreply.github.com>
194nav1s <nav1s@proton.me> <42621369+nav1s@users.noreply.github.com>
195Nick Mattis <nickm970@gmail.com> <nmattis@users.noreply.github.com>
196omni <omni+vagant@hack.org> <79493359+omnivagant@users.noreply.github.com>
197Pablo Correa Gómez <ablocorrea@hotmail.com> <32678034+pablofsf@users.noreply.github.com>
198Paul Zuchowski <pzuchowski@datto.com> <31706010+PaulZ-98@users.noreply.github.com>
199Peter Ashford <ashford@accs.com> <pashford@users.noreply.github.com>
200Peter Dave Hello <hsu@peterdavehello.org> <PeterDaveHello@users.noreply.github.com>
201Peter Wirdemo <peter.wirdemo@gmail.com> <4224155+pewo@users.noreply.github.com>
202Petros Koutoupis <petros@petroskoutoupis.com> <pkoutoupis@users.noreply.github.com>
203Ping Huang <huangping@smartx.com> <101400146+hpingfs@users.noreply.github.com>
204Piotr P. Stefaniak <pstef@freebsd.org> <pstef@users.noreply.github.com>
205Richard Allen <belperite@gmail.com> <33836503+belperite@users.noreply.github.com>
206Rich Ercolani <rincebrain@gmail.com> <214141+rincebrain@users.noreply.github.com>
207Rick Macklem <rmacklem@uoguelph.ca> <64620010+rmacklem@users.noreply.github.com>
208Rob Wing <rob.wing@klarasystems.com> <98866084+rob-wing@users.noreply.github.com>
209Roman Strashkin <roman.strashkin@nexenta.com> <Ramzec@users.noreply.github.com>
210Ryan Hirasaki <ryanhirasaki@gmail.com> <4690732+RyanHir@users.noreply.github.com>
211Samuel Wycliffe J <samwyc@hpe.com> <115969550+samwyc@users.noreply.github.com>
212Samuel Wycliffe <samuelwycliffe@gmail.com> <50765275+npc203@users.noreply.github.com>
213Savyasachee Jha <hi@savyasacheejha.com> <savyajha@users.noreply.github.com>
214Scott Colby <scott@scolby.com> <scolby33@users.noreply.github.com>
215Sean Eric Fagan <kithrup@mac.com> <kithrup@users.noreply.github.com>
216Shreshth Srivastava <shreshthsrivastava2@gmail.com> <66148173+Shreshth3@users.noreply.github.com>
217Spencer Kinny <spencerkinny1995@gmail.com> <30333052+Spencer-Kinny@users.noreply.github.com>
218Srikanth N S <srikanth.nagasubbaraoseetharaman@hpe.com> <75025422+nssrikanth@users.noreply.github.com>
219Stefan Lendl <s.lendl@proxmox.com> <1321542+stfl@users.noreply.github.com>
220Thomas Bertschinger <bertschinger@lanl.gov> <101425190+bertschinger@users.noreply.github.com>
221Thomas Geppert <geppi@digitx.de> <geppi@users.noreply.github.com>
222Tim Crawford <tcrawford@datto.com> <crawfxrd@users.noreply.github.com>
223Todd Seidelmann <18294602+seidelma@users.noreply.github.com>
224Tom Matthews <tom@axiom-partners.com> <tomtastic@users.noreply.github.com>
225Tony Perkins <tperkins@datto.com> <62951051+tony-zfs@users.noreply.github.com>
226Torsten Wörtwein <twoertwein@gmail.com> <twoertwein@users.noreply.github.com>
227Tulsi Jain <tulsi.jain@delphix.com> <TulsiJain@users.noreply.github.com>
228Václav Skála <skala@vshosting.cz> <33496485+vaclavskala@users.noreply.github.com>
229Vaibhav Bhanawat <vaibhav.bhanawat@delphix.com> <88050553+vaibhav-delphix@users.noreply.github.com>
230Vandana Rungta <vrungta@amazon.com> <46906819+vandanarungta@users.noreply.github.com>
231Violet Purcell <vimproved@inventati.org> <66446404+vimproved@users.noreply.github.com>
232Vipin Kumar Verma <vipin.verma@hpe.com> <75025470+vermavipinkumar@users.noreply.github.com>
233Wolfgang Bumiller <w.bumiller@proxmox.com> <Blub@users.noreply.github.com>
234XDTG <click1799@163.com> <35128600+XDTG@users.noreply.github.com>
235xtouqh <xtouqh@hotmail.com> <72357159+xtouqh@users.noreply.github.com>
236Yuri Pankov <yuripv@FreeBSD.org> <113725409+yuripv@users.noreply.github.com>
237Yuri Pankov <yuripv@FreeBSD.org> <82001006+yuripv@users.noreply.github.com>
238