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.
26Ahelenia Ziemia��ska <nabijaczleweli@gmail.com>
27Ahelenia Ziemia��ska <nabijaczleweli@nabijaczleweli.xyz>
28Alex John <alex@stty.io>
29Andreas Dilger <adilger@dilger.ca>
30Andrew Walker <awalker@ixsystems.com>
31Benedikt Neuffer <github@itfriend.de>
32Chengfei Zhu <chengfeix.zhu@intel.com>
33ChenHao Lu <18302010006@fudan.edu.cn>
34Chris Lindee <chris.lindee+github@gmail.com>
35Colm Buckley <colm@tuatha.org>
36Crag Wang <crag0715@gmail.com>
37Damian Szuberski <szuberskidamian@gmail.com>
38Daniel Kolesa <daniel@octaforge.org>
39Debabrata Banerjee <dbavatar@gmail.com>
40Finix Yan <yanchongwen@hotmail.com>
41Gaurav Kumar <gauravk.18@gmail.com>
42Gionatan Danti <g.danti@assyoma.it>
43Glenn Washburn <development@efficientek.com>
44Gordan Bobic <gordan.bobic@gmail.com>
45Gregory Bartholomew <gregory.lee.bartholomew@gmail.com>
46hedong zhang <h_d_zhang@163.com>
47Ilkka Sovanto <github@ilkka.kapsi.fi>
48InsanePrawn <Insane.Prawny@gmail.com>
49Jason Cohen <jwittlincohen@gmail.com>
50Jason Harmening <jason.harmening@gmail.com>
51Jeremy Faulkner <gldisater@gmail.com>
52Jinshan Xiong <jinshan.xiong@gmail.com>
53John Poduska <jpoduska@datto.com>
54Justin Scholz <git@justinscholz.de>
55Ka Ho Ng <khng300@gmail.com>
56Kash Pande <github@tripleback.net>
57Kay Pedersen <christianpe96@gmail.com>
58KernelOfTruth <kerneloftruth@gmail.com>
59Liu Hua <liu.hua130@zte.com.cn>
60Liu Qing <winglq@gmail.com>
61loli10K <ezomori.nozomu@gmail.com>
62Mart Frauenlob <allkind@fastest.cc>
63Matthias Blankertz <matthias@blankertz.org>
64Michael Gmelin <grembo@FreeBSD.org>
65Olivier Mazouffre <olivier.mazouffre@ims-bordeaux.fr>
66Piotr Kubaj <pkubaj@anongoth.pl>
67Quentin Zdanis <zdanisq@gmail.com>
68Roberto Ricci <ricci@disroot.org>
69Rob Norris <robn@despairlabs.com>
70Rob Norris <rob.norris@klarasystems.com>
71Sam Lunt <samuel.j.lunt@gmail.com>
72Sanjeev Bagewadi <sanjeev.bagewadi@gmail.com>
73Stoiko Ivanov <github@nomore.at>
74Tamas TEVESZ <ice@extreme.hu>
75WHR <msl0000023508@gmail.com>
76Yanping Gao <yanping.gao@xtaotech.com>
77Youzhong Yang <youzhong@gmail.com>
78
79# Signed-off-by: overriding Author:
80Yuxin Wang <yuxinwang9999@gmail.com> <Bi11gates9999@gmail.com>
81
82# Commits from strange places, long ago
83Brian Behlendorf <behlendorf1@llnl.gov> <behlendo@7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c>
84Brian Behlendorf <behlendorf1@llnl.gov> <behlendo@fedora-17-amd64.(none)>
85Brian Behlendorf <behlendorf1@llnl.gov> <behlendo@myhost.(none)>
86Brian Behlendorf <behlendorf1@llnl.gov> <ubuntu@ip-172-31-16-145.us-west-1.compute.internal>
87Brian Behlendorf <behlendorf1@llnl.gov> <ubuntu@ip-172-31-20-6.us-west-1.compute.internal>
88Herb Wartens <wartens2@llnl.gov> <wartens2@7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c>
89Ned Bass <bass6@llnl.gov> <bass6@zeno1.(none)>
90Tulsi Jain <tulsi.jain@delphix.com> <tulsi.jain@Tulsi-Jains-MacBook-Pro.local>
91
92# Mappings from Github no-reply addresses
93ajs124 <git@ajs124.de> <ajs124@users.noreply.github.com>
94Alek Pinchuk <apinchuk@axcient.com> <alek-p@users.noreply.github.com>
95Alexander Lobakin <alobakin@pm.me> <solbjorn@users.noreply.github.com>
96Alexey Smirnoff <fling@member.fsf.org> <fling-@users.noreply.github.com>
97Allen Holl <allen.m.holl@gmail.com> <65494904+allen-4@users.noreply.github.com>
98Ameer Hamza <ahamza@ixsystems.com> <106930537+ixhamza@users.noreply.github.com>
99Andrew J. Hesford <ajh@sideband.org> <48421688+ahesford@users.noreply.github.com>>
100Andrew Sun <me@andrewsun.com> <as-com@users.noreply.github.com>
101Aron Xu <happyaron.xu@gmail.com> <happyaron@users.noreply.github.com>
102Arun KV <arun.kv@datacore.com> <65647132+arun-kv@users.noreply.github.com>
103Ben Wolsieffer <benwolsieffer@gmail.com> <lopsided98@users.noreply.github.com>
104bernie1995 <bernie.pikes@gmail.com> <42413912+bernie1995@users.noreply.github.com>
105Boris Protopopov <boris.protopopov@actifio.com> <bprotopopov@users.noreply.github.com>
106Brad Forschinger <github@bnjf.id.au> <bnjf@users.noreply.github.com>
107Brandon Thetford <brandon@dodecatec.com> <dodexahedron@users.noreply.github.com>
108buzzingwires <buzzingwires@outlook.com> <131118055+buzzingwires@users.noreply.github.com>
109Cedric Maunoury <cedric.maunoury@gmail.com> <38213715+cedricmaunoury@users.noreply.github.com>
110Charles Suh <charles.suh@gmail.com> <charlessuh@users.noreply.github.com>
111Chris Peredun <chris.peredun@ixsystems.com> <126915832+chrisperedun@users.noreply.github.com>
112Dacian Reece-Stremtan <dacianstremtan@gmail.com> <35844628+dacianstremtan@users.noreply.github.com>
113Damian Szuberski <szuberskidamian@gmail.com> <30863496+szubersk@users.noreply.github.com>
114Daniel Hiepler <d-git@coderdu.de> <32984777+heeplr@users.noreply.github.com>
115Daniel Kobras <d.kobras@science-computing.de> <sckobras@users.noreply.github.com>
116Daniel Reichelt <hacking@nachtgeist.net> <nachtgeist@users.noreply.github.com>
117David Quigley <david.quigley@intel.com> <dpquigl@users.noreply.github.com>
118Dennis R. Friedrichsen <dennis.r.friedrichsen@gmail.com> <31087738+dennisfriedrichsen@users.noreply.github.com>
119Dex Wood <slash2314@gmail.com> <slash2314@users.noreply.github.com>
120DHE <git@dehacked.net> <DeHackEd@users.noreply.github.com>
121Dmitri John Ledkov <dimitri.ledkov@canonical.com> <19779+xnox@users.noreply.github.com>
122Dries Michiels <driesm.michiels@gmail.com> <32487486+driesmp@users.noreply.github.com>
123Edmund Nadolski <edmund.nadolski@ixsystems.com> <137826107+ednadolski-ix@users.noreply.github.com>
124��rico Nogueira <erico.erc@gmail.com> <34201958+ericonr@users.noreply.github.com>
125Fedor Uporov <fuporov.vstack@gmail.com> <60701163+fuporovvStack@users.noreply.github.com>
126Felix D��rre <felix@dogcraft.de> <felixdoerre@users.noreply.github.com>
127Felix Neum��rker <xdch47@posteo.de> <34678034+xdch47@users.noreply.github.com>
128Finix Yan <yancw@info2soft.com> <Finix1979@users.noreply.github.com>
129Gaurav Kumar <gauravk.18@gmail.com> <gaurkuma@users.noreply.github.com>
130George Gaydarov <git@gg7.io> <gg7@users.noreply.github.com>
131Georgy Yakovlev <gyakovlev@gentoo.org> <168902+gyakovlev@users.noreply.github.com>
132Gerardwx <gerardw@alum.mit.edu> <Gerardwx@users.noreply.github.com>
133Gian-Carlo DeFazio <defazio1@llnl.gov> <defaziogiancarlo@users.noreply.github.com>
134Giuseppe Di Natale <dinatale2@llnl.gov> <dinatale2@users.noreply.github.com>
135Hajo M��ller <dasjoe@gmail.com> <dasjoe@users.noreply.github.com>
136Harry Mallon <hjmallon@gmail.com> <1816667+hjmallon@users.noreply.github.com>
137Hi���u L�� <leorize+oss@disroot.org> <alaviss@users.noreply.github.com>
138Jake Howard <git@theorangeone.net> <RealOrangeOne@users.noreply.github.com>
139James Cowgill <james.cowgill@mips.com> <jcowgill@users.noreply.github.com>
140Jaron Kent-Dobias <jaron@kent-dobias.com> <kentdobias@users.noreply.github.com>
141Jason King <jason.king@joyent.com> <jasonbking@users.noreply.github.com>
142Jeff Dike <jdike@akamai.com> <52420226+jdike@users.noreply.github.com>
143Jitendra Patidar <jitendra.patidar@nutanix.com> <53164267+jsai20@users.noreply.github.com>
144Jo��o Carlos Mendes Lu��s <jonny@jonny.eng.br> <dioni21@users.noreply.github.com>
145John Eismeier <john.eismeier@gmail.com> <32205350+jeis2497052@users.noreply.github.com>
146John L. Hammond <john.hammond@intel.com> <35266395+jhammond-intel@users.noreply.github.com>
147John-Mark Gurney <jmg@funkthat.com> <jmgurney@users.noreply.github.com>
148John Ramsden <johnramsden@riseup.net> <johnramsden@users.noreply.github.com>
149Jonathon Fernyhough <jonathon@m2x.dev> <559369+jonathonf@users.noreply.github.com>
150Jose Luis Duran <jlduran@gmail.com> <jlduran@users.noreply.github.com>
151Justin Hibbits <chmeeedalf@gmail.com> <chmeeedalf@users.noreply.github.com>
152Kevin Greene <kevin.greene@delphix.com> <104801862+kxgreene@users.noreply.github.com>
153Kevin Jin <lostking2008@hotmail.com> <33590050+jxdking@users.noreply.github.com>
154Kevin P. Fleming <kevin@km6g.us> <kpfleming@users.noreply.github.com>
155Krzysztof Piecuch <piecuch@kpiecuch.pl> <3964215+pikrzysztof@users.noreply.github.com>
156Kyle Evans <kevans@FreeBSD.org> <kevans91@users.noreply.github.com>
157Lauren��iu Nicola <lnicola@dend.ro> <lnicola@users.noreply.github.com>
158loli10K <ezomori.nozomu@gmail.com> <loli10K@users.noreply.github.com>
159Lorenz H��depohl <dev@stellardeath.org> <lhuedepohl@users.noreply.github.com>
160Lu��s Henriques <henrix@camandro.org> <73643340+lumigch@users.noreply.github.com>
161Marcin Skarbek <git@skarbek.name> <mskarbek@users.noreply.github.com>
162Matt Fiddaman <github@m.fiddaman.uk> <81489167+matt-fidd@users.noreply.github.com>
163Maxim Filimonov <che@bein.link> <part1zano@users.noreply.github.com>
164Max Zettlmei��l <max@zettlmeissl.de> <6818198+maxz@users.noreply.github.com>
165Michael Niew��hner <foss@mniewoehner.de> <c0d3z3r0@users.noreply.github.com>
166Michael Zhivich <mzhivich@akamai.com> <33133421+mzhivich@users.noreply.github.com>
167MigeljanImeri <ImeriMigel@gmail.com> <78048439+MigeljanImeri@users.noreply.github.com>
168Mo Zhou <cdluminate@gmail.com> <5723047+cdluminate@users.noreply.github.com>
169Nick Mattis <nickm970@gmail.com> <nmattis@users.noreply.github.com>
170omni <omni+vagant@hack.org> <79493359+omnivagant@users.noreply.github.com>
171Pablo Correa G��mez <ablocorrea@hotmail.com> <32678034+pablofsf@users.noreply.github.com>
172Paul Zuchowski <pzuchowski@datto.com> <31706010+PaulZ-98@users.noreply.github.com>
173Peter Ashford <ashford@accs.com> <pashford@users.noreply.github.com>
174Peter Dave Hello <hsu@peterdavehello.org> <PeterDaveHello@users.noreply.github.com>
175Peter Wirdemo <peter.wirdemo@gmail.com> <4224155+pewo@users.noreply.github.com>
176Petros Koutoupis <petros@petroskoutoupis.com> <pkoutoupis@users.noreply.github.com>
177Ping Huang <huangping@smartx.com> <101400146+hpingfs@users.noreply.github.com>
178Piotr P. Stefaniak <pstef@freebsd.org> <pstef@users.noreply.github.com>
179Richard Allen <belperite@gmail.com> <33836503+belperite@users.noreply.github.com>
180Rich Ercolani <rincebrain@gmail.com> <214141+rincebrain@users.noreply.github.com>
181Rick Macklem <rmacklem@uoguelph.ca> <64620010+rmacklem@users.noreply.github.com>
182Rob Wing <rob.wing@klarasystems.com> <98866084+rob-wing@users.noreply.github.com>
183Roman Strashkin <roman.strashkin@nexenta.com> <Ramzec@users.noreply.github.com>
184Ryan Hirasaki <ryanhirasaki@gmail.com> <4690732+RyanHir@users.noreply.github.com>
185Samuel Wycliffe J <samwyc@hpe.com> <115969550+samwyc@users.noreply.github.com>
186Samuel Wycliffe <samuelwycliffe@gmail.com> <50765275+npc203@users.noreply.github.com>
187Savyasachee Jha <hi@savyasacheejha.com> <savyajha@users.noreply.github.com>
188Scott Colby <scott@scolby.com> <scolby33@users.noreply.github.com>
189Sean Eric Fagan <kithrup@mac.com> <kithrup@users.noreply.github.com>
190Spencer Kinny <spencerkinny1995@gmail.com> <30333052+Spencer-Kinny@users.noreply.github.com>
191Srikanth N S <srikanth.nagasubbaraoseetharaman@hpe.com> <75025422+nssrikanth@users.noreply.github.com>
192Stefan Lendl <s.lendl@proxmox.com> <1321542+stfl@users.noreply.github.com>
193Thomas Bertschinger <bertschinger@lanl.gov> <101425190+bertschinger@users.noreply.github.com>
194Thomas Geppert <geppi@digitx.de> <geppi@users.noreply.github.com>
195Tim Crawford <tcrawford@datto.com> <crawfxrd@users.noreply.github.com>
196Tom Matthews <tom@axiom-partners.com> <tomtastic@users.noreply.github.com>
197Tony Perkins <tperkins@datto.com> <62951051+tony-zfs@users.noreply.github.com>
198Torsten W��rtwein <twoertwein@gmail.com> <twoertwein@users.noreply.github.com>
199Tulsi Jain <tulsi.jain@delphix.com> <TulsiJain@users.noreply.github.com>
200V��clav Sk��la <skala@vshosting.cz> <33496485+vaclavskala@users.noreply.github.com>
201Vaibhav Bhanawat <vaibhav.bhanawat@delphix.com> <88050553+vaibhav-delphix@users.noreply.github.com>
202Violet Purcell <vimproved@inventati.org> <66446404+vimproved@users.noreply.github.com>
203Vipin Kumar Verma <vipin.verma@hpe.com> <75025470+vermavipinkumar@users.noreply.github.com>
204Wolfgang Bumiller <w.bumiller@proxmox.com> <Blub@users.noreply.github.com>
205xtouqh <xtouqh@hotmail.com> <72357159+xtouqh@users.noreply.github.com>
206Yuri Pankov <yuripv@FreeBSD.org> <113725409+yuripv@users.noreply.github.com>
207Yuri Pankov <yuripv@FreeBSD.org> <82001006+yuripv@users.noreply.github.com>
208