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> 56Justin Scholz <git@justinscholz.de> 57Ka Ho Ng <khng300@gmail.com> 58Kash Pande <github@tripleback.net> 59Kay Pedersen <christianpe96@gmail.com> 60KernelOfTruth <kerneloftruth@gmail.com> 61Liu Hua <liu.hua130@zte.com.cn> 62Liu Qing <winglq@gmail.com> 63loli10K <ezomori.nozomu@gmail.com> 64Mart Frauenlob <allkind@fastest.cc> 65Matthias Blankertz <matthias@blankertz.org> 66Michael Gmelin <grembo@FreeBSD.org> 67Olivier Mazouffre <olivier.mazouffre@ims-bordeaux.fr> 68Piotr Kubaj <pkubaj@anongoth.pl> 69Quentin Zdanis <zdanisq@gmail.com> 70Roberto Ricci <ricci@disroot.org> 71Rob Norris <robn@despairlabs.com> 72Rob Norris <rob.norris@klarasystems.com> 73Sam Lunt <samuel.j.lunt@gmail.com> 74Sanjeev Bagewadi <sanjeev.bagewadi@gmail.com> 75Sebastian Wuerl <s.wuerl@mailbox.org> 76SHENGYI HONG <aokblast@FreeBSD.org> 77Stoiko Ivanov <github@nomore.at> 78Tamas TEVESZ <ice@extreme.hu> 79WHR <msl0000023508@gmail.com> 80Yanping Gao <yanping.gao@xtaotech.com> 81Youzhong Yang <youzhong@gmail.com> 82 83# Signed-off-by: overriding Author: 84Alexander Ziaee <ziaee@FreeBSD.org> <concussious@runbox.com> 85Felix Schmidt <felixschmidt20@aol.com> <f.sch.prototype@gmail.com> 86Olivier Certner <olce@FreeBSD.org> <olce.freebsd@certner.fr> 87Phil Sutter <phil@nwl.cc> <p.github@nwl.cc> 88poscat <poscat@poscat.moe> <poscat0x04@outlook.com> 89Qiuhao Chen <chenqiuhao1997@gmail.com> <haohao0924@126.com> 90Ryan <errornointernet@envs.net> <error.nointernet@gmail.com> 91Sietse <sietse@wizdom.nu> <uglymotha@wizdom.nu> 92Yuxin Wang <yuxinwang9999@gmail.com> <Bi11gates9999@gmail.com> 93Zhenlei Huang <zlei@FreeBSD.org> <zlei.huang@gmail.com> 94 95# Commits from strange places, long ago 96Brian Behlendorf <behlendorf1@llnl.gov> <behlendo@7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c> 97Brian Behlendorf <behlendorf1@llnl.gov> <behlendo@fedora-17-amd64.(none)> 98Brian Behlendorf <behlendorf1@llnl.gov> <behlendo@myhost.(none)> 99Brian Behlendorf <behlendorf1@llnl.gov> <ubuntu@ip-172-31-16-145.us-west-1.compute.internal> 100Brian Behlendorf <behlendorf1@llnl.gov> <ubuntu@ip-172-31-20-6.us-west-1.compute.internal> 101Herb Wartens <wartens2@llnl.gov> <wartens2@7e1ea52c-4ff2-0310-8f11-9dd32ca42a1c> 102Ned Bass <bass6@llnl.gov> <bass6@zeno1.(none)> 103Tulsi Jain <tulsi.jain@delphix.com> <tulsi.jain@Tulsi-Jains-MacBook-Pro.local> 104 105# Mappings from Github no-reply addresses 106ajs124 <git@ajs124.de> <ajs124@users.noreply.github.com> 107Alek Pinchuk <apinchuk@axcient.com> <alek-p@users.noreply.github.com> 108Aleksandr Liber <aleksandr.liber@perforce.com> <61714074+AleksandrLiber@users.noreply.github.com> 109Alexander Lobakin <alobakin@pm.me> <solbjorn@users.noreply.github.com> 110Alexey Smirnoff <fling@member.fsf.org> <fling-@users.noreply.github.com> 111Allen Holl <allen.m.holl@gmail.com> <65494904+allen-4@users.noreply.github.com> 112Alphan Yılmaz <alphanyilmaz@gmail.com> <a1ea321@users.noreply.github.com> 113Ameer Hamza <ahamza@ixsystems.com> <106930537+ixhamza@users.noreply.github.com> 114Andrew J. Hesford <ajh@sideband.org> <48421688+ahesford@users.noreply.github.com>> 115Andrew Sun <me@andrewsun.com> <as-com@users.noreply.github.com> 116Aron Xu <happyaron.xu@gmail.com> <happyaron@users.noreply.github.com> 117Arun KV <arun.kv@datacore.com> <65647132+arun-kv@users.noreply.github.com> 118Ben Wolsieffer <benwolsieffer@gmail.com> <lopsided98@users.noreply.github.com> 119bernie1995 <bernie.pikes@gmail.com> <42413912+bernie1995@users.noreply.github.com> 120Bojan Novković <bnovkov@FreeBSD.org> <72801811+bnovkov@users.noreply.github.com> 121Boris Protopopov <boris.protopopov@actifio.com> <bprotopopov@users.noreply.github.com> 122Brad Forschinger <github@bnjf.id.au> <bnjf@users.noreply.github.com> 123Brandon Thetford <brandon@dodecatec.com> <dodexahedron@users.noreply.github.com> 124buzzingwires <buzzingwires@outlook.com> <131118055+buzzingwires@users.noreply.github.com> 125Cedric Maunoury <cedric.maunoury@gmail.com> <38213715+cedricmaunoury@users.noreply.github.com> 126Charles Suh <charles.suh@gmail.com> <charlessuh@users.noreply.github.com> 127Chris Peredun <chris.peredun@ixsystems.com> <126915832+chrisperedun@users.noreply.github.com> 128Dacian Reece-Stremtan <dacianstremtan@gmail.com> <35844628+dacianstremtan@users.noreply.github.com> 129Damian Szuberski <szuberskidamian@gmail.com> <30863496+szubersk@users.noreply.github.com> 130Daniel Hiepler <d-git@coderdu.de> <32984777+heeplr@users.noreply.github.com> 131Daniel Kobras <d.kobras@science-computing.de> <sckobras@users.noreply.github.com> 132Daniel Reichelt <hacking@nachtgeist.net> <nachtgeist@users.noreply.github.com> 133David Quigley <david.quigley@intel.com> <dpquigl@users.noreply.github.com> 134Dennis R. Friedrichsen <dennis.r.friedrichsen@gmail.com> <31087738+dennisfriedrichsen@users.noreply.github.com> 135Dex Wood <slash2314@gmail.com> <slash2314@users.noreply.github.com> 136DHE <git@dehacked.net> <DeHackEd@users.noreply.github.com> 137Dmitri John Ledkov <dimitri.ledkov@canonical.com> <19779+xnox@users.noreply.github.com> 138Dries Michiels <driesm.michiels@gmail.com> <32487486+driesmp@users.noreply.github.com> 139Edmund Nadolski <edmund.nadolski@ixsystems.com> <137826107+ednadolski-ix@users.noreply.github.com> 140Érico Nogueira <erico.erc@gmail.com> <34201958+ericonr@users.noreply.github.com> 141Fedor Uporov <fuporov.vstack@gmail.com> <60701163+fuporovvStack@users.noreply.github.com> 142Felix Dörre <felix@dogcraft.de> <felixdoerre@users.noreply.github.com> 143Felix Neumärker <xdch47@posteo.de> <34678034+xdch47@users.noreply.github.com> 144Finix Yan <yancw@info2soft.com> <Finix1979@users.noreply.github.com> 145Friedrich Weber <f.weber@proxmox.com> <56110206+frwbr@users.noreply.github.com> 146Gaurav Kumar <gauravk.18@gmail.com> <gaurkuma@users.noreply.github.com> 147George Gaydarov <git@gg7.io> <gg7@users.noreply.github.com> 148Georgy Yakovlev <gyakovlev@gentoo.org> <168902+gyakovlev@users.noreply.github.com> 149Gerardwx <gerardw@alum.mit.edu> <Gerardwx@users.noreply.github.com> 150Germano Massullo <germano.massullo@gmail.com> <Germano0@users.noreply.github.com> 151Gian-Carlo DeFazio <defazio1@llnl.gov> <defaziogiancarlo@users.noreply.github.com> 152Giuseppe Di Natale <dinatale2@llnl.gov> <dinatale2@users.noreply.github.com> 153Hajo Möller <dasjoe@gmail.com> <dasjoe@users.noreply.github.com> 154Harry Mallon <hjmallon@gmail.com> <1816667+hjmallon@users.noreply.github.com> 155Hiếu Lê <leorize+oss@disroot.org> <alaviss@users.noreply.github.com> 156Jake Howard <git@theorangeone.net> <RealOrangeOne@users.noreply.github.com> 157James Cowgill <james.cowgill@mips.com> <jcowgill@users.noreply.github.com> 158Jaron Kent-Dobias <jaron@kent-dobias.com> <kentdobias@users.noreply.github.com> 159Jason King <jason.king@joyent.com> <jasonbking@users.noreply.github.com> 160Jeff Dike <jdike@akamai.com> <52420226+jdike@users.noreply.github.com> 161Jitendra Patidar <jitendra.patidar@nutanix.com> <53164267+jsai20@users.noreply.github.com> 162João Carlos Mendes Luís <jonny@jonny.eng.br> <dioni21@users.noreply.github.com> 163John Eismeier <john.eismeier@gmail.com> <32205350+jeis2497052@users.noreply.github.com> 164John L. Hammond <john.hammond@intel.com> <35266395+jhammond-intel@users.noreply.github.com> 165John-Mark Gurney <jmg@funkthat.com> <jmgurney@users.noreply.github.com> 166John Ramsden <johnramsden@riseup.net> <johnramsden@users.noreply.github.com> 167Jonathon Fernyhough <jonathon@m2x.dev> <559369+jonathonf@users.noreply.github.com> 168Jose Luis Duran <jlduran@gmail.com> <jlduran@users.noreply.github.com> 169Justin Hibbits <chmeeedalf@gmail.com> <chmeeedalf@users.noreply.github.com> 170Kaitlin Hoang <kthoang@amazon.com> <khoang98@users.noreply.github.com> 171Kevin Greene <kevin.greene@delphix.com> <104801862+kxgreene@users.noreply.github.com> 172Kevin Jin <lostking2008@hotmail.com> <33590050+jxdking@users.noreply.github.com> 173Kevin P. Fleming <kevin@km6g.us> <kpfleming@users.noreply.github.com> 174Krzysztof Piecuch <piecuch@kpiecuch.pl> <3964215+pikrzysztof@users.noreply.github.com> 175Kyle Evans <kevans@FreeBSD.org> <kevans91@users.noreply.github.com> 176Laurențiu Nicola <lnicola@dend.ro> <lnicola@users.noreply.github.com> 177loli10K <ezomori.nozomu@gmail.com> <loli10K@users.noreply.github.com> 178Lorenz Hüdepohl <dev@stellardeath.org> <lhuedepohl@users.noreply.github.com> 179Luís Henriques <henrix@camandro.org> <73643340+lumigch@users.noreply.github.com> 180Marcin Skarbek <git@skarbek.name> <mskarbek@users.noreply.github.com> 181Matt Fiddaman <github@m.fiddaman.uk> <81489167+matt-fidd@users.noreply.github.com> 182Maxim Filimonov <che@bein.link> <part1zano@users.noreply.github.com> 183Max Zettlmeißl <max@zettlmeissl.de> <6818198+maxz@users.noreply.github.com> 184Michael Niewöhner <foss@mniewoehner.de> <c0d3z3r0@users.noreply.github.com> 185Michael Zhivich <mzhivich@akamai.com> <33133421+mzhivich@users.noreply.github.com> 186MigeljanImeri <ImeriMigel@gmail.com> <78048439+MigeljanImeri@users.noreply.github.com> 187Mo Zhou <cdluminate@gmail.com> <5723047+cdluminate@users.noreply.github.com> 188Nick Mattis <nickm970@gmail.com> <nmattis@users.noreply.github.com> 189omni <omni+vagant@hack.org> <79493359+omnivagant@users.noreply.github.com> 190Pablo Correa Gómez <ablocorrea@hotmail.com> <32678034+pablofsf@users.noreply.github.com> 191Paul Zuchowski <pzuchowski@datto.com> <31706010+PaulZ-98@users.noreply.github.com> 192Peter Ashford <ashford@accs.com> <pashford@users.noreply.github.com> 193Peter Dave Hello <hsu@peterdavehello.org> <PeterDaveHello@users.noreply.github.com> 194Peter Wirdemo <peter.wirdemo@gmail.com> <4224155+pewo@users.noreply.github.com> 195Petros Koutoupis <petros@petroskoutoupis.com> <pkoutoupis@users.noreply.github.com> 196Ping Huang <huangping@smartx.com> <101400146+hpingfs@users.noreply.github.com> 197Piotr P. Stefaniak <pstef@freebsd.org> <pstef@users.noreply.github.com> 198Richard Allen <belperite@gmail.com> <33836503+belperite@users.noreply.github.com> 199Rich Ercolani <rincebrain@gmail.com> <214141+rincebrain@users.noreply.github.com> 200Rick Macklem <rmacklem@uoguelph.ca> <64620010+rmacklem@users.noreply.github.com> 201Rob Wing <rob.wing@klarasystems.com> <98866084+rob-wing@users.noreply.github.com> 202Roman Strashkin <roman.strashkin@nexenta.com> <Ramzec@users.noreply.github.com> 203Ryan Hirasaki <ryanhirasaki@gmail.com> <4690732+RyanHir@users.noreply.github.com> 204Samuel Wycliffe J <samwyc@hpe.com> <115969550+samwyc@users.noreply.github.com> 205Samuel Wycliffe <samuelwycliffe@gmail.com> <50765275+npc203@users.noreply.github.com> 206Savyasachee Jha <hi@savyasacheejha.com> <savyajha@users.noreply.github.com> 207Scott Colby <scott@scolby.com> <scolby33@users.noreply.github.com> 208Sean Eric Fagan <kithrup@mac.com> <kithrup@users.noreply.github.com> 209Spencer Kinny <spencerkinny1995@gmail.com> <30333052+Spencer-Kinny@users.noreply.github.com> 210Srikanth N S <srikanth.nagasubbaraoseetharaman@hpe.com> <75025422+nssrikanth@users.noreply.github.com> 211Stefan Lendl <s.lendl@proxmox.com> <1321542+stfl@users.noreply.github.com> 212Thomas Bertschinger <bertschinger@lanl.gov> <101425190+bertschinger@users.noreply.github.com> 213Thomas Geppert <geppi@digitx.de> <geppi@users.noreply.github.com> 214Tim Crawford <tcrawford@datto.com> <crawfxrd@users.noreply.github.com> 215Todd Seidelmann <18294602+seidelma@users.noreply.github.com> 216Tom Matthews <tom@axiom-partners.com> <tomtastic@users.noreply.github.com> 217Tony Perkins <tperkins@datto.com> <62951051+tony-zfs@users.noreply.github.com> 218Torsten Wörtwein <twoertwein@gmail.com> <twoertwein@users.noreply.github.com> 219Tulsi Jain <tulsi.jain@delphix.com> <TulsiJain@users.noreply.github.com> 220Václav Skála <skala@vshosting.cz> <33496485+vaclavskala@users.noreply.github.com> 221Vaibhav Bhanawat <vaibhav.bhanawat@delphix.com> <88050553+vaibhav-delphix@users.noreply.github.com> 222Vandana Rungta <vrungta@amazon.com> <46906819+vandanarungta@users.noreply.github.com> 223Violet Purcell <vimproved@inventati.org> <66446404+vimproved@users.noreply.github.com> 224Vipin Kumar Verma <vipin.verma@hpe.com> <75025470+vermavipinkumar@users.noreply.github.com> 225Wolfgang Bumiller <w.bumiller@proxmox.com> <Blub@users.noreply.github.com> 226XDTG <click1799@163.com> <35128600+XDTG@users.noreply.github.com> 227xtouqh <xtouqh@hotmail.com> <72357159+xtouqh@users.noreply.github.com> 228Yuri Pankov <yuripv@FreeBSD.org> <113725409+yuripv@users.noreply.github.com> 229Yuri Pankov <yuripv@FreeBSD.org> <82001006+yuripv@users.noreply.github.com> 230