From bd806d310be05dba195d20ad5d7aa8bce4bf0bdd Mon Sep 17 00:00:00 2001 From: Abhishek Lekshmanan Date: Thu, 21 Mar 2019 10:32:32 +0100 Subject: [PATCH] mailmap: updates for nautilus Signed-off-by: Abhishek Lekshmanan --- .mailmap | 65 +++++++++++++++++++++++---- .organizationmap | 111 +++++++++++++++++++++++++++++++++++++++++++++-- .peoplemap | 3 ++ 3 files changed, 166 insertions(+), 13 deletions(-) diff --git a/.mailmap b/.mailmap index f44a6da0b3dd0..afc7587dd9922 100644 --- a/.mailmap +++ b/.mailmap @@ -36,6 +36,7 @@ Andrew Leung Andy Allan Anis Ayari +Anton Oks Aristoteles Neto Aron Gunn Ashish Chandra @@ -95,6 +96,7 @@ Dan Chai Daniel Gollub Daniel Oliveira Daniel Gryniewicz +Dan Guo Dan Mick Dan Mick Dan Mick @@ -167,6 +169,7 @@ Guang Yang Guilhem Lettron Hans Bogert Haodong Tang +Haomai Wang Haomai Wang Haomai Wang Haomai Wang @@ -194,6 +197,7 @@ Jacek J. Łakis Jacek J. Łakis Jaemyoun Lee James Mcclune +James Mcclune James Page Jason Dillaman Jason Dillaman @@ -203,6 +207,7 @@ Jason Dillaman Jean-Charles Lopez Jeff Epstein Jeff Layton +Jeff Layton Jeffrey Lu Jeffrey Lu Jenkins @@ -269,6 +274,8 @@ Ken Dreyer Kévin Caradant Kiseleva Alyona Kongming Wu +Коренберг Марк +Коренберг Марк Kuanlong Li Lan De Laszlo Boszormenyi @@ -277,8 +284,10 @@ Lenz Grimmer Liul Luo Kexue Luo Muyao -Luo Runbing -Luo Runbing +Luo Runbing +Luo Runbing +Luo Runbing +Li Bingyang Li Hongjie Li Jing Li Wang @@ -319,6 +328,7 @@ Matt Benjamin Matthew Roy Matthew Roy Matthew Wodrich +Maxime Guyot Maxime Robert Mehdi Abaakouk Michael Riederer @@ -348,7 +358,8 @@ Neha Ummareddy Neil Levine Nick Fisk Nicolas Yong -Ning Tao <63358@sangfor.com> +Tao Ning <63358@sangfor.com> +Tao Ning Nick Erdmann Nick Erdmann <11783095+nrdmn@users.noreply.github.com> Ning Yao @@ -357,11 +368,13 @@ Noah Watkins Noah Watkins Orit Wasserman Orit Wasserman +Orit Wasserman Pascal de Bruijn Patience Warnick Patrick McGarry Patrick McGarry Patrick Nawracay +Patrick Donnelly Pan Liu Paul Emmerich Pavan Rallabhandi @@ -387,6 +400,7 @@ Ren Huanwen Ren Huanwen Riccardo Ferretti Richard Brown +Rick Chen Roald J. van Loon Robert Jansen Robert LeBlanc @@ -435,6 +449,7 @@ Sangdi Xu Scott A. Brandt Sebastian Wagner Sebastien Chen +Sébastien Han Sébastien Han Sébastien Han Sébastien Han @@ -504,6 +519,7 @@ Valentin Arshanes Thomas Varada Kari Varada Kari Varada Kari +Varada Kari Vasu Kulkarni Vasu Kulkarni Vasu Kulkarni @@ -558,6 +574,7 @@ Xu Biao Xuan Liu XueYu Bai XueYu Bai +XueYu Bai Yan Lei Yan Lei Yan Lei @@ -589,7 +606,10 @@ Yehuda Sadeh Ye Tian Yichao Li Ying He +Yin Zheng Yixing Yan +Yingxin Cheng +Yingxin Cheng Yuelong Guang Yongqiang He Yongyue Sun @@ -604,25 +624,22 @@ Yuri Weinstein Yuri Weinstein Yuri Weinstein Yuri Weinstein +Yuri Weinstein +Yuval Lifshitz Yuli Yang Xianxia Xiao -<<<<<<< HEAD XiaoCheng Wang +Xiaofei Cui Xiaofei Cui -======= Xie Xingguo Xuehan Xu ->>>>>>> a688393f8d... doc: mailmap updates for mimic Zack Cerza Zack Cerza Zack Cerza Zengran Zhang -<<<<<<< HEAD Zengran Zhang <13121369189@126.com> Zhen Zeng -======= Zengran Zhang <13121369189@126.com> ->>>>>>> a688393f8d... doc: mailmap updates for mimic Zeqiang Zhuang Zhang Lei Zhang Lei <243290414@qq.com> @@ -652,6 +669,36 @@ Zhi Zhang Zhi Zhang Zhi Zhang Zhu Shangzhong +Zhu Jie Wen Zhuang Xiaochun Ziye Yang Zou Aiguo +Xinying Song +Xinying Song +Li Kefei +Liu Peng +Ming Hao Cong +David Wang +Lan Liu +Hyun-ha +Liu Yang kuan +Xiaoman Huang +Hao Wang +Chi Zhang +Enming Zhang +Liu Wei +Chen Yu Peng +Anthony D Atri +Peng Lai +Peng Lai +Ganesh Mahalingam +Song Shuangyang +Tone Zhang +Alfonso Martínez +Wu Mingqiao +Kaleb S. Keithley +Kyr Shatskyy +Myoungwon Oh +Eric Ivancich +Yan Jun +Liu Changcheng diff --git a/.organizationmap b/.organizationmap index 87a7c4e4aa02c..847b7ef75c35f 100644 --- a/.organizationmap +++ b/.organizationmap @@ -48,7 +48,12 @@ Anchor Hosting Christian Marie Anchor Hosting Sharif Olorin ARM Tone Zhang ArtiBit Rutger ter Borg +B1 Systems Michel Bayan Mohammad Salehe +Baidu Liu Peng +Baidu Hao Wang +Baidu Song Shuangyang +BBC James P. Weaver BCI Marco Garcês Beezim Florent Manens Bigpoint.com Moritz Möller @@ -81,11 +86,15 @@ China Mobile Jing Wenjun Li Hongjie China Mobile Liu Hong China Mobile Liu Yuhong +China Mobile Li Kefei China Mobile lvshuhua China Mobile Xiubo Li China Mobile Zhang Shaowen China Mobile Yuli Yang China Mobile wangzhengyong +China Mobile Yin Zheng +China Mobile Xiaoman Huang +China Mobile Gangbiao Liu China Unicom Liu Lei Chinac Huan Zhang Chinac Xinxin Shu @@ -95,6 +104,7 @@ Chunghwa Telecom Chu Hua-Rong CISCO Johnu George CISCO Kai Zhang CISCO Roland Mechler +CityNetwork Florian Haas Cloudin Xinying Song Cloudin Bingyin Zhang Cloudin Wang Song Bo @@ -122,6 +132,7 @@ DiDi Xin Yuan DiDi Yichao Li DiDi Li Wang DigitalOcean Adam Wolfe Gordon +DigitalOcean Robin H. Johnson DigitalOcean Vaibhav Bhembre Digiware Willem Jan Withagen DreamHost Andrew Farmer @@ -143,6 +154,7 @@ DreamHost Stephon Striplin Wesley Spikes Dtdream Li Peng Dtdream Wei Qian +Dyncloud Tom Barron Eayun Dunrong Huang Eayun Liu Yang Eayun Zhao Chao @@ -167,17 +179,22 @@ Easystack Wanlong Gao Easystack Yang Wang Easystack Peng Cheng Zhang Easystack Zhao Yang Han +Easystack Xiaoguang Wang ESPOL Edwin F. Boza Fairbanks Robert Jansen FAU Michael Eischer Flipkart Abhishek Varshney +Flipkart Varada Kari Free Software Foundation Europe Benoît Knecht Fujitsu Edward Yang +Fujitsu Shiyang Ruan Fujitsu Igor Podoski +Fujitsu Mao Zhongyi Fujitsu Piotr Dałek Fujitsu Shotaro Kawaguchi Fujitsu Takanori Nakao Fujitsu Takeshi Miyamae +Fujitsu Mao Zhongyi Gaikai David Coles GameServers.com Brian Rak Gentoo Kacper Kowalik @@ -245,6 +262,7 @@ HP Blaine Gardner HP Joe Handzik Huayun Zheng Yin Huazhong University of Science and Technology Luo Runbing +HXT Semiconductor Jiang Yutang IBM Andrew Solomon IBM Michel Normand IBM Samuel Matzek @@ -301,7 +319,7 @@ Inspur Sibei Gao Inspur XueYu Bai Inspur Ying He Inspur Wang Shu Guang -Inspur Wuming Qiao +Inspur Wu Mingqiao Intel Anjaneya Chagam Intel Chendi Xue Intel Chunmei Liu @@ -316,6 +334,7 @@ Intel Liu-Chunmei Intel Ma Jianpeng Intel Mahati Chamarthy Intel Orlando Moreno +Intel Qiaowei Ren Intel Tushar Gohad Intel Shu, Xinxin Intel Tushar Gohad @@ -323,10 +342,11 @@ Intel Wang, Yaguang Intel Xiaoyan Li Intel Xiaoxi Chen Intel Yan, Zheng -Intel Yingxin +Intel Yingxin Cheng Intel Yuan Zhou Intel Zhiqiang Wang Intel Ziye Yang +Intel Liu Changcheng inwinSTACK inc. Chang-Yi Lee inwinSTACK inc. Albert Tu inwinSTACK inc. MinSheng Lin @@ -354,6 +374,7 @@ Lebanon Evangelical School Jonathan Dieter Dongmao Zhang LETV Ji Chen LETV Wu Xingyi +Lenovo Dan Guo Linaro Steve Capper Linaro wei xiao Linaro Tone Zhang @@ -361,6 +382,8 @@ Linaro Yazen Ghannam Linaro Yibo Cai Los Alamos National Laboratory Esteban Molina-Estolano Locator Technologies Kris Jurka +Naver Junyoung, Sung +Naver Hyun-ha Nefos b.v. Willem Jan Withagen McClune Technologies James Mcclune Mellanox Adir Lev @@ -406,8 +429,10 @@ Pacific Northwest National Laboratory Erwin, Brock A Evan Felix Pacific Northwest National Laboratory Scott Devoid Piston Cloud Computing Mike Lundy +Platform.sh Simon Ruggier Pogoapp Paul Meserve Profihost Stefan Priebe +ProphetStor Rick Chen Proxmox Server Solutions GmbH Fabian Grünbichler Purdue University Mike Shuey Qarnot Clément Pellegrini @@ -415,6 +440,9 @@ Qnap Tim Lin Quadrature Capital Limited Jim Wright Quantum Corporation Bassam Tabbara Raidix International Marov Aleksey +Red Hat Ben England +Red Hat Yaniv Kaul +Red Hat Kaleb S. Keithley Red Hat Adam C. Emerson Red Hat Adam Kupczyk Red Hat Ademar de Souza Reis Jr @@ -433,6 +461,7 @@ Red Hat Brad Hubbard Red Hat Brett Niver Red Hat Brian Andrus Red Hat Casey Bodley +Red Hat Cleber Rosa Red Hat Colin Walters Red Hat Daniel Gryniewicz Red Hat Dan Mick @@ -465,10 +494,12 @@ Red Hat John Spray Red Hat John Wilkins Red Hat Jos Collin Red Hat Josh Durgin +Red Hat Juan Miguel Olmo Martínez Red Hat JuanJose 'JJ' Galvez Red Hat Kanika Murarka Red Hat Kefu Chai Red Hat Ken Dreyer +Red Hat Karun Josy Red Hat Loic Dachary Red Hat Loic Dachary Red Hat Luis Pabón @@ -503,6 +534,7 @@ Red Hat Sahid Orentino Ferdjaoui Sam Lang Red Hat Samuel Just Red Hat Sandon Van Ness +Red Hat Scoots Hamilton Red Hat Sébastien Han Red Hat Shilpa Jagannath Red Hat Shinobu Kinjo @@ -514,6 +546,7 @@ Red Hat Tamil Muthamizhan Red Hat Thomas Serlin Red Hat Tom Callaway Red Hat Travis Rhoden +Red Hat Travis Nielsen Red Hat Tyler Brekke Red Hat Vasu Kulkarni Red Hat Venky Shankar @@ -521,11 +554,13 @@ Red Hat Vikhyat Umrao Red Hat Warren Usui Red Hat Yan, Zheng Red Hat Yehuda Sadeh +Red Hat Yuval Lifshitz Red Hat Yuri Weinstein Red Hat Zack Cerza Reliance Jio Infocomm Ltd. Abhishek Lekshmanan Reliance Jio Infocomm Ltd. Ashish Chandra Reliance Jio Infocomm Ltd. Swami Reddy +RWTH Aachen University Nick Erdmann Roald van Loon Consultancy Roald J. van Loon Ruijie Networks Ning Yao Salesforce Sameer Tiwari @@ -547,6 +582,7 @@ SanDisk Sushma Gurram SanDisk Tomy Cheru SanDisk Varada Kari SanDisk Vishal Kanaujia +Sanger Institute Matthew Vernon Sangfor Xiaocheng Wang Sangfor Tao Ning Sangfor Xiaofei Cui @@ -559,16 +595,20 @@ Sangfor Fang Yuxiang Sangfor Min Chen Sangfor Jinling Zhao Sangfor Junhui Tang +Sangfor Zengran Zhang +Sangfor Tang Junhui Sandstone Yang DeLiu SAP Marc Koderer Science & Technology Facilities Council George Ryall SendFaster Christopher O'Connell +SenseTime Xinying Song SK Telecom Byungsu Park SK Telecom Ilsoo Byun SK Telecom Myoungwon Oh SK Telecom Taewoong Kim Sociomantic Labs Iain Buclaw Spectra Logic Alan Somers +StackHPC Stig Telfer SUSE Abhishek Lekshmanan SUSE Adam Spiers SUSE Alexander Graf @@ -578,6 +618,7 @@ SUSE Daniel Oliveira SUSE David Disseldorp SUSE Dirk Mueller SUSE Fabian Vogt +SUSE Franck Bui SUSE Hannes Reinecke SUSE Holger Macht SUSE Igor Fedotov @@ -589,6 +630,7 @@ SUSE Kai Wagner SUSE Karl Eichwalder SUSE Karol Mroz SUSE Kapil Sharma +SUSE Kyr Shatskyy SUSE Laura Paduano SUSE Lenz Grimmer SUSE Luis Henriques @@ -604,10 +646,10 @@ SUSE Sebastian Krah SUSE Sebastian Wagner SUSE Stephan Müller SUSE Sebastian Wagner +SUSE Shyukri Shyukriev SUSE Stefan Knorr SUSE Stephan Müller SUSE Supriti Singh ->>>>>>> a688393f8d... doc: mailmap updates for mimic SUSE Sven Seeberg SUSE Tatjana Dehler SUSE Thorsten Behrens @@ -618,6 +660,7 @@ SWITCH Jens-Christian Fischer Simon Leinen Synesis Aleksei Gutikov T2Cloud Leo Zhang +T2Cloud Wang Hongxu TCloud Computing CC Lien TCloud Computing Henry C Chang TCloud Computing Herb Shiu @@ -630,6 +673,8 @@ Tencent Redick Wang Tencent Wei Luo Tencent Wenjun Huang Tencent Zhi Zhang +Tencent Jeegn Chen +Tenctent Ming Hao Cong Tencent Cloud Chang Liu Tencent Cloud Jing Chen Tencent Cloud Shanchun Lv @@ -650,11 +695,39 @@ UMCloud Jian Su UMCloud Jiaying Ren UMCloud Rongze Zhu UMCloud Enming Zhang +UMCloud Lan Liu UMCloud Shengjing Zhu UMCloud Tao Chen UMCloud Yixing Yan UMCloud Yang Honggang +Unaffiliated Massimiliano Cuttini +Unaffiliated Diksha Godbole +Unaffiliated Gaurav Sitlani +Unaffiliated Valentin Lorentz +Unaffiliated ludehp +Unaffiliated Peng Lai +Unaffiliated Chen Yu Peng +Unaffiliated Zhanhao (Jasper) Liu +Unaffiliated Tatsuya Naganawa +Unaffiliated David Wahler +Unaffiliated mooncake +Unaffiliated Konstantin Sakhinov +Unaffiliated Tomasz Setkowski +Unaffiliated Enming Zhang +Unaffiliated Chengguang Xu +Unaffiliated Marcin Juszkiewicz +Unaffiliated Liu Yang kuan +Unaffiliated Jerry Lee +Unaffiliated Dai Dang Van +Unaffiliated Tomáš Kukrál +Unaffiliated Remy Zandwijk +Unaffiliated Jonas Jelten +Unaffiliated Brad Fitzpatrick +Unaffiliated Anthony D Atri +Unaffiliated Alexey Shabalin +Unaffiliated Alexandru Cucu Unaffiliated Aaron Bassett +Unaffiliated Arthur Liu Unaffiliated Abhishek Dixit Unaffiliated Accela Zhao Unaffiliated Adam Twardowski @@ -669,10 +742,12 @@ Unaffiliated Andy Allan Unaffiliated Anirudha Bose Unaffiliated Anis Ayari Unaffiliated Anthony Alba +Unaffiliated Anton Oks Unaffiliated Armando Segnini Unaffiliated Aron Gunn Unaffiliated Arthur Gorjux Unaffiliated Ashita Dashottar +Unaffiliated Ashutosh Narkar Unaffiliated Ashita Kasam <694240887@qq.com> Unaffiliated Bhavishya Gopesh Unaffiliated Bi Shun Ke @@ -697,6 +772,7 @@ Unaffiliated Daniel Schepler Unaffiliated Daniel Glaser Unaffiliated Darrell Enns Unaffiliated David Anderson +Unaffiliated David Wang Unaffiliated Dennis Schafroth Unaffiliated Quan Deng Unaffiliated Ding Dinghua @@ -801,9 +877,11 @@ Unaffiliated Lucas Fantinel Unaffiliated Коренберг Марк Unaffiliated Malcolm Lee Unaffiliated Marc Schoechlin +Unaffiliated Marcos Paulo de Souza Unaffiliated Matt Boyle Unaffiliated Matt Richards Unaffiliated Mauricio Garavaglia +Unaffiliated Maxime Guyot Unaffiliated Maxime Robert Unaffiliated Mehdi Abaakouk Unaffiliated Michael Nelson @@ -815,7 +893,9 @@ Unaffiliated Ming Hao Cong Unaffiliated Mykola Golub Unaffiliated mychoxin Unaffiliated Myna Vajha +Unaffiliated Nathan Weinberg Unaffiliated Neha Ummareddy +Unaffiliated Neha Gupta Unaffiliated Nick Erdmann Unaffiliated Nick Fisk Unaffiliated Nicolas Yong @@ -830,6 +910,7 @@ Unaffiliated Patrick Donnelly Unaffiliated Pavani Rajula Unaffiliated Paul Emmerich Unaffiliated Peng Zhang +Unaffiliated Peng Wang Unaffiliated Peter Keresztes Schmidt Unaffiliated Peter Maloney Peter Woodman @@ -839,7 +920,9 @@ Unaffiliated Piotr Dałek Unaffiliated Qinghua Jin Unaffiliated Rachana Patel Unaffiliated Rahul Aggarwal +Unaffiliated Ranjitha G Unaffiliated Rishabh Kumar +Unaffiliated Rishabh Dave Unaffiliated Roberto Oliveira Unaffiliated Robin Dehu Unaffiliated Robin Tang @@ -852,10 +935,12 @@ Unaffiliated Rust Shen Unaffiliated Ryne Li Unaffiliated Sahithi R V Unaffiliated Sam Zaydel +Unaffiliated Sandor Zeestraten Unaffiliated Sarthak Munshi Unaffiliated Saumay Agrawal Unaffiliated Sebastien Chen Unaffiliated Sergey Arkhipov +Unaffiliated sdnets Unaffiliated Shang Ding Unaffiliated Shanggao Qiu Unaffiliated Shawn Chen @@ -865,6 +950,7 @@ Unaffiliated Simon Guinot Unaffiliated Simran Singhal Unaffiliated Song Xinying Unaffiliated Spandan Kumar Sahu +Unaffiliated Stefan Kooman Unaffiliated Stephen F Taylor Unaffiliated Steve Stock Unaffiliated Taeksang Kim @@ -872,10 +958,16 @@ Unaffiliated Tahia Khan Unaffiliated Ted-Chang Unaffiliated Thomas Johnson Unaffiliated Thomas Laumondais +Unaffiliated Thore Kruess Unaffiliated Tim Bishop Unaffiliated Tim Freund +Unaffiliated Tina Kallio Unaffiliated Tobias Gall Unaffiliated Tobias Suckow +Unaffiliated TommyLike +Unaffiliated Timofey Titovets +Unaffiliated Thore Kruess +Unaffiliated Tsung-Ju Lii Unaffiliated Tyler Zeqing Qi Unaffiliated Uday Mullangi Unaffiliated Valentin Arshanes Thomas @@ -893,6 +985,7 @@ Unaffiliated William A. Kennington III Wilson E. Alvarez Unaffiliated Wu Jian Unaffiliated Xan Peng +Unaffiliated Xiang Dai <764524258@qq.com> Unaffiliated Xiaojun Liao Unaffiliated Xie Rui <875016668@qq.com> Unaffiliated Xin Liao @@ -911,6 +1004,7 @@ Unaffiliated Yao Zongyou Unaffiliated Yatin Kumbhare Unaffiliated YiQiang Chen Unaffiliated Yongyue Sun +Unaffiliated YongSheng Zhang Unaffiliated You Ji Unaffiliated Yuelong Guang Unaffiliated Yupeng Chen @@ -923,8 +1017,10 @@ Unaffiliated Zhao Kun Unaffiliated Zhe Zhang Unaffiliated Zhicheng Wei Unaffiliated Zhou Rui Song <236131368@qq.com> +Unaffiliated Zhou Peng Unaffiliated Zhou Zhengping Unaffiliated Zhuang Xiaochun +Unaffiliated Zhu Jie Wen UnionPay Liao Weizhong UnionPay Lin Xu Hua UnionPay Zhang Wen @@ -956,6 +1052,7 @@ University of Michigan My Do University of Toronto Shehbaz Jaffer University of Utah Xing Lin University of Wisconsin Bruce Flynn +Vico Research Marc Schoechlin Virtuozzo Andrey Parfenov Viva64 Svyatoslav VRT Stuart Longland @@ -970,6 +1067,7 @@ Wido 42on Wido den Hollander Wikia Lukasz Jagiello X-ION Mouad Benchchaoui X-ION Stephan Renatus +XSky Shang Ding XSky Huang Jun XSky hechuang XSky Haomai Wang @@ -997,8 +1095,9 @@ ZTE Chuanhong Wang ZTE clove ZTE Gong Chuang ZTE Lan De +ZTE Li Bingyang ZTE Luo Kexue -ZTE Luo Runbing +ZTE Luo Runbing ZTE Ren Huanwen ZTE Shun Song ZTE Song Baisen @@ -1012,6 +1111,10 @@ ZTE Yan Jun ZTE Zhang Zezhu ZTE Zhu Shangzhong ZTE Zou Aiguo +ZTE Chi Zhang +ZTE Liu Wei +ZTE Chen Zhenghua +ZTE Yan Jun # # Local Variables: # compile-command: "git log --pretty='%aN <%aE>' | \ diff --git a/.peoplemap b/.peoplemap index 06abf4777043e..143d0167bd58c 100644 --- a/.peoplemap +++ b/.peoplemap @@ -22,6 +22,7 @@ Alexandre Marangone Alexandre Marangone Alfredo Deza Dan Mick Dan Mick David Zafman David Zafman +Florian Haas Florian Haas Greg Farnum Greg Farnum Gregory Meno Igor Fedotov Igor Fedotov @@ -45,6 +46,7 @@ Noah Watkins Noah Watkins Patrick McGarry Patrick McGarry Piotr Dałek Piotr Dałek Piotr Dałek Radoslaw Zarzynski +Robin H. Johnson Ross Turk Ross Turk Sage Weil Sage Weil Sahid Orentino Ferdjaoui Sahid Orentino Ferdjaoui @@ -52,6 +54,7 @@ Samuel Just Samuel Just Sandon Van Ness Sandon Van Ness Tamil Muthamizhan Tamil Muthamizhan Tyler Brekke Tyler Brekke +Varada Kari Warren Usui Warren Usui Wang Song Bo wangsongbo Yan, Zheng Yan, Zheng