From 140d6853e9fe8d19cb7ddffe0fcdac9f48d258dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 11 Aug 2023 18:32:24 +0200 Subject: [PATCH] mailmap: "reduce contributor count by 13" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This merges the counts for a few people who existed with and without accents, or with different capitalizations, and suffixes. Also, stop overriding NeilBrown's spelling of the name. Note: IIUC, we have two Luca Bruno's: lucab@debian.net is not the same as the other Luca BRUNO who works on coreos. @@ -386 +385,0 @@ - 2 Damjan Georgievski @@ -401 +399,0 @@ - 1 Daniel Berrange @@ -425 +423 @@ - 11 Daniel P. Berrangé + 12 Daniel P. Berrangé @@ -888 +885,0 @@ - 1 Jiri Pirko @@ -891 +888 @@ - 1 Jiří Pírko + 2 Jiří Pírko @@ -1105 +1102 @@ - 12 Luca BRUNO + 18 Luca BRUNO @@ -1107 +1104 @@ - 8 Luca Bruno + 2 Luca Bruno @@ -1160,2 +1157 @@ - 1 Marc-Andre Lureau - 17 Marc-André Lureau + 18 Marc-André Lureau @@ -1313,2 +1309 @@ - 31 Michal Sekletar - 168 Michal Sekletár + 199 Michal Sekletár @@ -1383,3 +1378 @@ - 2 Neal Gompa - 1 Neal Gompa (ニール・ゴンパ) - 12 Neil Brown + 3 Neal Gompa (ニール・ゴンパ) @@ -1387,0 +1381 @@ + 12 NeilBrown @@ -1494,2 +1488 @@ - 1 Perry Yuan - 1 Perry.Yuan + 3 Perry Yuan @@ -1941,2 +1934 @@ - 2 Viktar Vauchkevich - 2 Viktar Vaŭčkievič + 4 Viktar Vaŭčkievič @@ -2016,2 +2008 @@ - 1 Yao Wei - 1 Yao Wei (魏銘廷) + 2 Yao Wei (魏銘廷) @@ -2145 +2135,0 @@ - 1 gdamjan @@ -2256 +2245,0 @@ - 1 perry_yuan @@ -2331 +2320 @@ - 18 Дамјан Георгиевски + 21 Дамјан Георгиевски --- .mailmap | 52 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/.mailmap b/.mailmap index a6367972463..b117bb80cae 100644 --- a/.mailmap +++ b/.mailmap @@ -8,6 +8,7 @@ Alexandros Frantzis Ananth N Mavinakayanahalli Ananth N Mavinakayanahalli Andreas Henriksson +Andrey Yashkin <38919268+AndreyYashkin@users.noreply.github.com> Anthony Parsons Antoine Eiche Arnd Bergmann @@ -22,21 +23,25 @@ Charles (Chas) Williams Chen Qi <40684930+ChenQi1989@users.noreply.github.com> Christophe Varoqui Colin Guthrie +Cristian Rodríguez Daniel Elstner Daniel Gorbea Daniel J Walsh Daniel Kahn Gillmor Daniel Machon +Daniel P. Berrangé Daniel Rusek Daniel Stekloff Daniel Șerbănescu Dann Frazier Dave Reisner +David Santamaría Rogado David Zeuthen David Zeuthen David Zeuthen Davide Cavalca Dennis Wassenberg +Diego Canuhe <46734128+dcanuhe@users.noreply.github.com> Diego Elio Pettenò Dmitriy Geels Dmitry Khlebnikov @@ -48,8 +53,10 @@ Fabiano Fidêncio Fabiano Fidencio Federico Di Pierro Fionn Cleary +Frantisek Sumsal Frederic Crozat Gautier Husson +Gaël PORTAY George Gaydarov Gianluca Boiano Greg Kroah-Hartman @@ -68,12 +75,15 @@ Hendrik Westerberg Ian Campbell Insun Pyo Insun Pyo +Jay Burger Jerone Young Jiuyang Liu +Jiří Pírko John Paul Adrian Glaubitz John Paul Adrian Glaubitz Jon Ringle Jonas Dorel +Jonathon Kowalski Josef Andersson Josef Andersson José Bollo @@ -95,10 +105,12 @@ Lennart Poettering Lennart Poettering Lennart Poettering Leonard König +Luca BRUNO Luis Felipe Strano Moraes Lukáš Nykrýn Lukáš Říha Mao Huang +Marc-André Lureau Marco d'Itri Marcus Cooper Mario Limonciello @@ -116,21 +128,23 @@ Michael Buesch Michael Hoy Michael Olbrich Michael Trapp -Michal Soltys -Michal Suchanek -Michal Suchanek Michal Sekletár +Michal Sekletár +Michal Soltys +Michal Suchanek Michał Szczepański Michel Kraus <27o@users.noreply.github.com> Michele Guerini Rocco +Mike Auty Miklos Vajna Milan Pässler -Neil Brown -Neil Brown +Neal Gompa (ニール・ゴンパ) Niklas Tibbling <45659916+tibbling@users.noreply.github.com> Nikolas Nyby Nogisaka Sadata Olaf Hering +Omojola Joshua +Omojola Joshua <109356020+1awesomeJ@users.noreply.github.com> Otto Wallenius Pablo Lezaeta Reyes Paolo Giangrandi @@ -138,6 +152,7 @@ Patrick Mansfield Patryk Kocielnik Paul Mundt Pavel Hrdina +Perry Yuan Peter D'Hoye Piotr Szydełko Piter PUNK @@ -149,7 +164,9 @@ Robby Workman Robert Gerus Robert "arachnist" Gerus Robert Kolchmeyer Robert Love +Roger James Roman Stingler +Ronald Tschalär Rubén Suárez Alvarez Salvo Tomaselli Sandy Carter @@ -157,6 +174,7 @@ Scott James Remnant Scott James Remnant Seraphime Kirkovski Shawn Landden +Shawn Landden Shawn Landden Silvio Knizek Simon Peeters @@ -165,6 +183,7 @@ Stanislav Angelovič Stasiek Michalski Stefan Pietsch Stefan Schweter +Stephan Edel Stuart McLaren Susant Sahani <145210+ssahani@users.noreply.github.com> Susant Sahani @@ -192,29 +211,18 @@ Tomasz Pala Torsten Hilbrich Umut Tezduyar Lindskog Vasilis Liaskovitis +Viktar Vaŭčkievič Vladislav Vishnyakov +Weblate William Jon McCann Wim van Mourik Yann E. Morin +Yao Wei (魏銘廷) +Yi Gao Yin Kangkai Zachary Winnerman <33329648+winnerman-pythian@users.noreply.github.com> Zbigniew Jędrzejewski-Szmek Zbigniew Jędrzejewski-Szmek -Łukasz Stelmach -Jonathon Kowalski -Diego Canuhe <46734128+dcanuhe@users.noreply.github.com> -David Santamaría Rogado -Mike Auty -Roger James -Stephan Edel -Andrey Yashkin <38919268+AndreyYashkin@users.noreply.github.com> -Ronald Tschalär -Jay Burger -Yi Gao -Weblate -Omojola Joshua -Omojola Joshua <109356020+1awesomeJ@users.noreply.github.com> -Gaël PORTAY -Frantisek Sumsal -Cristian Rodríguez msizanoen +Łukasz Stelmach +Дамјан Георгиевски