Merge pull request #115 from SUSE/wip-12-0-3-alt

Merge upstream v12.0.3 plus ceph#14997

.gitmodules

@@ -52,3 +52,6 @@
 [submodule "src/crypto/isa-l/isa-l_crypto"]
 	path = src/crypto/isa-l/isa-l_crypto
 	url = https://github.com/01org/isa-l_crypto
+[submodule "src/blkin"]
+	path = src/blkin
+	url = https://github.com/ceph/blkin

.mailmap

@@ -89,6 +89,7 @@ Dominik Hannen <cantares1+github@gmail.com> <dhxgit@users.noreply.github.com>
 Donghai Xu <xu.donghai@h3c.com>
 Dongmao Zhang <deanraccoon@gmail.com>
 Edward Yang <eyang@us.fujitsu.com> <root@gluster5.gfs.fsw.fujitsu.com>
+Enming Zhang <enming.zhang@umcloud.com>
 Eric Lee <eric.lee@hgst.com>
 Eric Mourgaya <eric.mourgaya@arkea.com> <eric.mourgaya@gmail.com>
 Erwin, Brock A <Brock.Erwin@pnl.gov> <Brock.Erwin@pnl.govgit>
@@ -258,7 +259,8 @@ Min Chen <minchen@ubuntukylin.com>
 MingXin Liu <mingxin.liu@kylin-cloud.com> <mingxinliu@ubuntukylin.com>
 Mingyue Zhao <zhao.mingyue@h3c.com>
 Mykola Golub <mgolub@mirantis.com> <mgolub@zhuzha.mirantis.lviv.net>
-Nathan Cutler <ncutler@suse.com> 
+Nathan Cutler <ncutler@suse.com>
+Nathan Cutler <ncutler@suse.com> <nculter@suse.com>
 Nathan Cutler <ncutler@suse.com> <ncutler@suse.cz>
 Na Xie <xie.na@h3c.com>
 Neha Ummareddy <nehaummareddy@gmail.com>
@@ -351,6 +353,7 @@ Shehbaz Jaffer <shehbaz.jaffer@mail.utoronto.ca> <shehbazjaffer007@gmail.com>
 Shinobu Kinjo <shinobu@redhat.com> <shinobu@linux.com> 
 Shinobu Kinjo <shinobu@redhat.com> <ceph@ceph-stack.redhat.com>
 Shishir Gowda <shishir.gowda@sandisk.com>
+shiqi <m13913886148@gmail.com> <1454927420@qq.com>
 Shu, Xinxin <xinxin.shu@intel.com>
 Shun Song <song.shun3@zte.com.cn>
 Shun Song <song.shun3@zte.com.cn> <songshun134@126.com>
@@ -372,6 +375,7 @@ Tamil Muthamizhan <tmuthami@redhat.com>
 Tamil Muthamizhan <tmuthami@redhat.com> <tmuthamizhan@MacBook-Air.local>
 Tamil Muthamizhan <tmuthami@redhat.com> <tamil@magna002.ceph.redhat.com>
 Tang Jin <tang.jin@istuary.com>
+Tang Wenjun <tang.wenjun3@zte.com.cn>
 Tao Chang <changtao@hihuron.com>
 Thomas Bechtold <t.bechtold@telekom.de> <thomasbechtold@jpberlin.de>
 Thomas Cantin <thomas.cantin@telecom-bretagne.eu>
@@ -399,8 +403,7 @@ Warren Usui <warren.usui@inktank.com>
 Warren Usui <wusui@redhat.com> <wusui@users.noreply.github.com>
 Warren Usui <wusui@redhat.com> <wusui@magna002.ceph.redhat.com>
 Warren Usui <wusui@redhat.com> <wusui@ubuntu.(none)>
-Weibing Zhang <zhangweibing@unitedstack.com>
-Weibing Zhang <zhangweibing@unitedstack.com> <atheism.zhang@gmail.com>
+Weibing Zhang <atheism.zhang@gmail.com>
 Weijun Duan <duanweijun@h3c.com>
 Wei Jin <jinwei15@wanda.cn>
 Wei Jin <jinwei15@wanda.cn> <wjin.cn@gmail.com>
@@ -452,6 +455,7 @@ You Ji <youji@ebay.com>
 Yuan Zhou <yuan.zhou@intel.com> <dunk007@gmail.com>
 Yunchuan Wen <yunchuan.wen@kylin-cloud.com> <yunchuanwen@ubuntukylin.com>
 Yuri Weinstein <yuriw@redhat.com> <yweinste@redhat.com>
+Yuri Weinstein <yuriw@redhat.com> <yweinstei@redhat.com>
 Yuri Weinstein <yuriw@redhat.com> <yuri.weinstein@gmail.com>
 Yuri Weinstein <yuriw@redhat.com> <yuriw@magna002.ceph.redhat.com>
 Yuri Weinstein <yuriw@redhat.com> <yweins@redhat.com>

.organizationmap

@@ -27,6 +27,19 @@ Acaleph <contact@acale.ph> Alistair Israel <aisrael@gmail.com>
 Alcatel Lucent <contact@alcatel-lucent.com> Joseph McDonald <joseph.mcdonald@alcatel-lucent.com>
 Alcatel Lucent <contact@alcatel-lucent.com> Ker Liu <ker.liu@alcatel-lucent.com>
 Aliyun <contact@aliyun.com> Jeffrey Lu <lzhng2000@aliyun.com>
+Alibaba <contact@alibaba-inc.com> James Liu <james.liu@alibaba-inc.com>
+Alibaba <contact@alibaba-inc.com> Pan Liu <wanjun.lp@alibaba-inc.com>
+Alibaba <contact@alibaba-inc.com> Jin Cai <caijin.caij@alibaba-inc.com>
+Alibaba <contact@alibaba-inc.com> Ming Lin <ming.lin@alibaba-inc.com>
+Alibaba <contact@alibaba-inc.com> Sheng Qiu <sheng.qiu@alibaba-inc.com>
+Alibaba <contact@alibaba-inc.com> Jianjian Huo <j.huo@alibaba-inc.com>
+Alibaba <contact@alibaba-inc.com> Yanjiang Xu <yanjiang.xyj@alibaba-inc.com>
+Alibaba <contact@alibaba-inc.com> Jin Cai <caijin.caij@alibaba-inc.com>
+Alibaba <contact@alibaba-inc.com> Ke Lin <haoqi.lk@alibaba-inc.com>
+Alibaba <contact@alibaba-inc.com> Wentao Zhang <wentao.zwt@alibaba-inc.com>
+Alibaba <contact@alibaba-inc.com> Rongyao Chen <rongyao.cry@alibaba-inc.com>
+Alibaba <contact@alibaba-inc.com> Yi Zhang <boqian.zy@alibaba-inc.com>
+Alibaba <contact@alibaba-inc.com> Yongyou <yongyou.yl@alibaba-inc.com>
 Anchor Hosting <contact@anchor.com.au> Christian Marie <pingu@anchor.net.au>
 Anchor Hosting <contact@anchor.com.au> Sharif Olorin <sio@tesser.org>
 ArtiBit <contact@artibit.com> Rutger ter Borg <rutger@terborg.net>
@@ -53,12 +66,14 @@ China Mobile <contact@chinamobile.com> donglinpeng <donglinpeng@cmss.chinamobile
 China Mobile <contact@chinamobile.com> Gui Hecheng <guihecheng@cmss.chinamobile.com>
 China Mobile <contact@chinamobile.com> Guo Zhandong <guozhandong@cmss.chinamobile.com>
 China Mobile <contact@chinamobile.com> Jing Wenjun <jingwenjun@cmss.chinamobile.com>
+China Mobile <contact@chinamobile.com> lihongjie <lihongjie@cmss.chinamobile.com>
 China Mobile <contact@chinamobile.com> lvshuhua <lvshuhua@cmss.chinamobile.com>
 China Mobile <contact@chinamobile.com> Zhang Shaowen <zhangshaowen@cmss.chinamobile.com>
 China Mobile <contact@chinamobile.com> wangzhengyong <wangzhengyong@cmss.chinamobile.com>
 Chinac <info@chinac.com> Huan Zhang <zhanghuan@chinac.com>
 Chinac <info@chinac.com> Xinxin Shu <shuxinxin@chinac.com>
 Choopa, LLC <contact@choopa.com> Adam Twardowski <adam.twardowski@gmail.com>
+Chunghwa Telecom <contact@cht.com.tw> hrchu <hrchu@cht.com.tw>
 CISCO <contact@cisco.com> Johnu George <johnugeo@cisco.com>
 CISCO <contact@cisco.com> Kai Zhang <zakir.exe@gmail.com>
 CISCO <contact@cisco.com> Roland Mechler <rmechler@cisco.com>
@@ -112,12 +127,15 @@ Endurance International Group <contact@endurance.com> Robert LeBlanc <robert.leb
 eNovance <contact@enovance.com> Babu Shanmugam <anbu@enovance.com>
 eNovance <contact@enovance.com> Sebastien Han <sebastien.han@enovance.com>
 EISOO <contact@eisoo.com> Fang Yuxiang <fang.yuxiang@eisoo.com>
+EISOO <contact@eisoo.com> lu.shasha <lu.shasha@eisoo.com>
 Enproduktion GmbH <contact@produktion.io> Malte Fiala <maltefiala@produktion.io>
 EPAM <contact@epam.com> Andrey Kuznetsov <Andrey_Kuznetsov@epam.com>
 Exalead <contact@exalead.com> <roche+git@exalead.com>
 Easystack <contact@easystack.cn> Dongsheng Yang <dongsheng.yang@easystack.cn>
 Easystack <contact@easystack.cn> Wanlong Gao <wanlong.gao@easystack.cn>
+ESPOL <contact@espol.edu.ec> Edwin F. Boza <eboza@espol.edu.ec>
 Fairbanks <contact@fairbanks.nl> Robert Jansen <r.jansen@fairbanks.nl>
+FAU <contact@fau.de> Michael Eischer <michael.eischer@fau.de>
 Flipkart <contact@flipkart.com> Abhishek Varshney <abhishek.varshney@flipkart.com>
 Free Software Foundation Europe <office@fsfeurope.org> Benoît Knecht <benoit.knecht@fsfe.org>
 Fujitsu <contact@fujitsu.com> Edward Yang <eyang@us.fujitsu.com>
@@ -249,6 +267,7 @@ Intel <contact@intel.com> Xiaoxi Chen <xiaoxi.chen@intel.com>
 Intel <contact@intel.com> Yan, Zheng <zheng.z.yan@intel.com>
 Intel <contact@intel.com> Yuan Zhou <yuan.zhou@intel.com>
 Intel <contact@intel.com> Zhiqiang Wang <zhiqiang.wang@intel.com>
+Intel <contact@intel.com> Ziye Yang <ziye.yang@intel.com>
 inwinSTACK inc. <leo.l@inwinstack.com> Chang-Yi Lee <cy.l@inwinstack.com>
 inwinSTACK inc. <leo.l@inwinstack.com> Albert Tu <albert.t@inwinstack.com>
 inwinSTACK inc. <leo.l@inwinstack.com> MinSheng Lin <minsheng.l@inwinstack.com>
@@ -276,13 +295,15 @@ LETV <contact@letv.com> Dongmao Zhang <deanraccoon@gmail.com>
 LETV <contact@letv.com> Ji Chen <insomnia@139.com>
 LETV <contact@letv.com> Wu Xingyi <wuxingyi@letv.com>
 Linaro <contact@linaro.org> Steve Capper <steve.capper@linaro.org>
+Linaro <contact@linaro.org> wei xiao <wei.xiao@linaro.org>
 Linaro <contact@linaro.org> Yazen Ghannam <yazen.ghannam@linaro.org>
 Linaro <contact@linaro.org> Yibo Cai <yibo.cai@linaro.org>
 Los Alamos National Laboratory <contact@lanl.gov> Esteban Molina-Estolano <eestolan@lanl.gov>
 Locator Technologies <contact@locatortechnologies.com> Kris Jurka <kjurka@locatortechnologies.com>
 Nefos b.v. <info@nefos.nl> Willem Jan Withagen <wjw@nefos.nl>
 Mellanox <contact@mellanox.com> Adir Lev <adirl@mellanox.com>
 Mellanox <contact@mellanox.com> Avner BenHanoch <avnerb@mellanox.com>
+Mellanox <contact@mellanox.com> DanielBar-On <danielbo@mellanox.com>
 Mellanox <contact@mellanox.com> Oren Duer <oren@mellanox.com>
 Mellanox <contact@mellanox.com> Sarit Zubakov <saritz@mellanox.com>
 Mellanox <contact@mellanox.com> Vu Pham <vu@mellanox.com>
@@ -307,6 +328,7 @@ Netease <contact@netease.com> Dong Wu <archer.wudong@gmail.com>
 Ocado <contact@ocado.com> Luis Periquito <luis.periquito@ocado.com>
 Odiso <contact@odiso.com> Alexandre Derumier <aderumier@odiso.com>
 Opower <contact@opower.com> Derrick Schneider <derrick.schneider@opower.com>
+Oracle <contact@oracle.com> Nikita Gerasimov <nikita.gerasimov@oracle.com>
 OVH <ceph@ovh.net> Bartłomiej Święcki <bartlomiej.swiecki@corp.ovh.com>
 OVH <ceph@ovh.net> Etienne Menguy <etienne.menguy@corp.ovh.com>
 OVH <ceph@ovh.net> Paweł Sadowski <pawel.sadowski@corp.ovh.com>
@@ -343,11 +365,13 @@ Red Hat <contact@redhat.com> Douglas Fuller <dfuller@redhat.com>
 Red Hat <contact@redhat.com> Erwan Velu <erwan@redhat.com>
 Red Hat <contact@redhat.com> Federico Simoncelli <fsimonce@redhat.com>
 Red Hat <contact@redhat.com> Frank Filz <ffilz@redhat.com>
+Red Hat <contact@redhat.com> Ian Colle <icolle@redhat.com>
 Red Hat <contact@redhat.com> Ira Cooper <ira@redhat.com>
 Red Hat <contact@redhat.com> Gary Lowell <glowell@redhat.com>
 Red Hat <contact@redhat.com> Greg Farnum <gfarnum@redhat.com>
 Red Hat <contact@redhat.com> Grégory Charot <gcharot@redhat.com>
 Red Hat <contact@redhat.com> Gregory Meno <gmeno@redhat.com>
+Red Hat <contact@redhat.com> Guillaume Abrioux <gabrioux@redhat.com>
 Red Hat <contact@redhat.com> Haïkel Guémar <hguemar@redhat.com>
 Red Hat <contact@redhat.com> Huamin Chen <hchen@redhat.com>
 Red Hat <contact@redhat.com> Ilya Dryomov <idryomov@redhat.com>
@@ -473,7 +497,6 @@ Telecom Bretagne <contact@telecom-bretagne.eu> Ahoussi Armand <ahoussi.say@telec
 Telecom Bretagne <contact@telecom-bretagne.eu> Baptiste Veuillez <baptiste.veuillez--mainard@telecom-bretagne.eu>
 Telecom Bretagne <contact@telecom-bretagne.eu> Hazem Amara <hazem.amara@telecom-bretagne.eu>
 Telecom Bretagne <contact@telecom-bretagne.eu> Thomas Cantin <thomas.cantin@telecom-bretagne.eu>
-Tencent <contact@tencent.com> Chang Liu <liuchang0812@gmail.com>
 Tencent <contact@tencent.com> Wei Luo <weilluo@tencent.com>
 Tencent <contact@tencent.com> Wenjun Huang <wenjunhuang@tencent.com>
 Tencent <contact@tencent.com> Zhi Zhang <willzzhang@tencent.com>
@@ -485,9 +508,11 @@ The Linux Box <contact@linuxbox.com> Matt Benjamin <matt@linuxbox.com>
 The University of Arizona <contact@arizona.edu> James Ryan Cresawn <jrcresawn@gmail.com>
 Time Warner Cable Inc. <contact@twcable.com> Bryan Stillwell <bryan.stillwell@twcable.com>
 Trendy Tech <contact@trendytech.com.cn> shiqi <m13913886148@gmail.com>
+Trendy Tech <contact@trendytech.com.cn> Lei Zhang <243290414@qq.com>
 Ubuntu Kylin <contact@ubuntukylin.com> Min Chen <minchen@ubuntukylin.com>
 UMCloud <contact@umcloud.com> Jiaying Ren <mikulely@gmail.com>
 UMCloud <contact@umcloud.com> Rongze Zhu <zrzhit@gmail.com>
+UMCloud <contact@umcloud.com> Enming Zhang <enming.zhang@umcloud.com>
 Unaffiliated <no@organization.net> Aaron Bassett <abassett@gmail.com>
 Unaffiliated <no@organization.net> Abhishek Dixit <dixitabhi@gmail.com>
 Unaffiliated <no@organization.net> Accela Zhao <accelazh@gmail.com>
@@ -507,6 +532,8 @@ Unaffiliated <no@organization.net> BJ Lougee <almightybeeij@gmail.com>
 Unaffiliated <no@organization.net> Bosse Klykken <larkly@gmail.com>
 Unaffiliated <no@organization.net> Brian Felton <bjfelton@gmail.com>
 Unaffiliated <no@organization.net> Burkhard Linke <Burkhard.Linke@computational.bio.uni-giessen.de>
+Unaffiliated <no@organization.net> craigchi <craig10624@gmail.com>
+Unaffiliated <no@organization.net> Chang Liu <liuchang0812@gmail.com>
 Unaffiliated <no@organization.net> Charles Alva <charlesalva@gmail.com>
 Unaffiliated <no@organization.net> Chanyoung Park <park910113@gmail.com>
 Unaffiliated <no@organization.net> Cheng Cheng <ccheng.leo@gmail.com>
@@ -542,6 +569,7 @@ Unaffiliated <no@organization.net> François Lafont <flafdivers@free.fr>
 Unaffiliated <no@organization.net> Frank S. Filz <ffilzlnx@mindspring.com>
 Unaffiliated <no@organization.net> Frank Yu <flyxiaoyu@gmail.com>
 Unaffiliated <no@organization.net> Gabriel Sentucq <perso@kazhord.fr>
+Unaffiliated <no@organization.net> haodong.tang <tanghaodong25@gmail.com>
 Unaffiliated <no@organization.net> Harald Klein <hari@vt100.at>
 Unaffiliated <no@organization.net> Hector Martin <marcan@marcan.st>
 Unaffiliated <no@organization.net> Hong Zhangoole <hong.zhangoole@gmail.com>
@@ -593,6 +621,7 @@ Unaffiliated <no@organization.net> Kevin Cox <kevincox@kevincox.ca>
 Unaffiliated <no@organization.net> Kevin Jones <k.j.jonez@gmail.com>
 Unaffiliated <no@organization.net> Kim Vandry <vandry@TZoNE.ORG>
 Unaffiliated <no@organization.net> koleosfuscus <koleosfuscus@yahoo.com>
+Unaffiliated <no@organization.net> Kyr Shatskyy <kyrylo.shatskyy@gmail.com>
 Unaffiliated <no@organization.net> Laurent Guerby <laurent@guerby.net>
 Unaffiliated <no@organization.net> Lee Revell <rlrevell@gmail.com>
 Unaffiliated <no@organization.net> Leo Zhang <nguzcf@gmail.com>
@@ -635,6 +664,7 @@ Unaffiliated <no@organization.net> Ryne Li <lizhenqiangsnake@gmail.com>
 Unaffiliated <no@organization.net> Sahithi R V <tansy.rv@gmail.com>
 Unaffiliated <no@organization.net> Sam Zaydel <szaydel@gmail.com>
 Unaffiliated <no@organization.net> Sarthak Munshi <sarthakmunshi@gmail.com>
+Unaffiliated <no@organization.net> Saumay Agrawal <saumay.agrawal@gmail.com>
 Unaffiliated <no@organization.net> Sergey Arkhipov <nineseconds@yandex.ru>
 Unaffiliated <no@organization.net> Shang Ding <dingshang2013@163.com>
 Unaffiliated <no@organization.net> Shanggao Qiu <qiushanggao@qq.com>
@@ -643,6 +673,8 @@ Unaffiliated <no@organization.net> Shawn Edwards <lesser.evil@gmail.com>
 Unaffiliated <no@organization.net> Simon Guinot <simon.guinot@sequanux.org>
 Unaffiliated <no@organization.net> Stephen F Taylor <steveftaylor@gmail.com>
 Unaffiliated <no@organization.net> Steve Stock <steve@technolope.org>
+Unaffiliated <no@organization.net> Taeksang Kim <voidbag@gmail.com>
+Unaffiliated <no@organization.net> Tahia Khan <tahia.khan@gmail.com>
 Unaffiliated <no@organization.net> Thomas Johnson <ntmatter@gmail.com>
 Unaffiliated <no@organization.net> Thomas Laumondais <thomas.laumondais@gmail.com>
 Unaffiliated <no@organization.net> Tim Freund <tim@freunds.net>
@@ -672,6 +704,7 @@ Unaffiliated <no@organization.net> YiQiang Chen <cyqsign@163.com>
 Unaffiliated <no@organization.net> Yongyue Sun <abioy.sun@gmail.com>
 Unaffiliated <no@organization.net> You Ji <jiyou09@gmail.com>
 Unaffiliated <no@organization.net> Zhang Shaowen <zhang_shaowen@139.com>
+Unaffiliated <no@organization.net> Weibing Zhang <atheism.zhang@gmail.com>
 Unaffiliated <no@organization.net> Zhao Junwang <zhjwpku@gmail.com>
 Unaffiliated <no@organization.net> Zhao Kun <jswps2011@163.com>
 Unaffiliated <no@organization.net> Zhe Zhang <zzxuanyuan@gmail.com>
@@ -687,7 +720,6 @@ UnitedStack <contact@unitedstack.com> Kun Huang <academicgareth@gmail.com>
 UnitedStack <contact@unitedstack.com> Li Tianqing <tianqing@unitedstack.com>
 UnitedStack <contact@unitedstack.com> Ning Yao <yaoning@unitedstack.com>
 UnitedStack <contact@unitedstack.com> wangsongbo <wangsongbo@unitedstack.com>
-UnitedStack <contact@unitedstack.com> Weibing Zhang <zhangweibing@unitedstack.com>
 UnitedStack <contact@unitedstack.com> Yankun Li <liyankun@unitedstack.com>
 University of California, Santa Cruz <contact@cs.ucsc.edu> Adam Crume <adamcrume@gmail.com>
 University of California, Santa Cruz <contact@cs.ucsc.edu> Andrew Leung <aleung@cs.ucsc.edu>
@@ -714,6 +746,7 @@ Wido 42on <contact@42on.com> Wido den Hollander <wido@42on.com>
 Wikia <contact@wikia-inc.com> Lukasz Jagiello <lukasz@wikia-inc.com>
 X-ION <contact@x-ion.de> Mouad Benchchaoui <m.benchchaoui@x-ion.de>
 X-ION <contact@x-ion.de> Stephan Renatus <s.renatus@x-ion.de>
+XSky <contact@xsky.com> hechuang <hechuang@xsky.com>
 XSky <contact@xsky.com> Haomai Wang <haomai@xsky.com>
 XSky <contact@xsky.com> Min Chen <chenmin@xsky.com>
 XSky <contact@xsky.com> Mingxin Liu <mingxin@xsky.com>
@@ -737,6 +770,7 @@ ZTE <contact@zte.com.cn> Luo Runbing <runsisi@zte.com.cn>
 ZTE <contact@zte.com.cn> Xie Xingguo <xie.xingguo@zte.com.cn>
 ZTE <contact@zte.com.cn> Shun Song <song.shun3@zte.com.cn>
 ZTE <contact@zte.com.cn> Song Baisen <song.baisen@zte.com.cn>
+ZTE <contact@zte.com.cn> Tang Wenjun <tang.wenjun3@zte.com.cn>
 ZTE <contact@zte.com.cn> Wei Qiaomiao <wei.qiaomiao@zte.com.cn>
 ZTE <contact@zte.com.cn> Yan Jun <yan.jun8@zte.com.cn>
 ZTE <contact@zte.com.cn> Zhang Zezhu <zhang.zezhu@zte.com.cn>

.peoplemap

@@ -50,3 +50,4 @@ Yan, Zheng <zyan@redhat.com> Yan, Zheng <zheng.z.yan@intel.com>
 Yehuda Sadeh <ysadehwe@redhat.com> Yehuda Sadeh <yehuda@inktank.com>
 Yuri Weinstein <yuriw@redhat.com> Yuri Weinstein <yuri.weinstein@inktank.com>
 Zhi Zhang <zhangz.david@outlook.com> Zhi (David) Zhang <zhangz@yahoo-inc.com>
+Patrick Donnelly <pdonnell@redhat.com> Patrick Donnelly <batrick@batbytes.com>

AUTHORS

@@ -7,17 +7,17 @@ Sage Weil <sage@redhat.com>
 Component Technical Leads
 -------------------------
 
-Core, RADOS   - Samuel Just <sjust@redhat.com>
-RBD           - Josh Durgin <jdurgin@redhat.com>
-                Jason Dillaman <dillaman@redhat.com>
-RBD (kernel)  - Ilya Dryomov <idryomov@redhat.com>
-RGW           - Yehuda Sadeh <yehuda@redhat.com>
-CephFS        - Greg Farnum <gfarnum@redhat.com>
-                Yan, Zheng <zyan@redhat.com>
-Deployment    - Alfredo Deza <adeza@redhat.com>
-Teuthology    - Zack Cerza <zack@redhat.com>
-Calamari      - Gregory Meno <gmeno@redhat.com>
-Chef Cookbook - Guilhem Lettron <guilhem@lettron.fr>
+Core, RADOS     - Josh Durgin <jdurgin@redhat.com>
+RBD             - Jason Dillaman <dillaman@redhat.com>
+RBD (kernel)    - Ilya Dryomov <idryomov@redhat.com>
+RGW             - Yehuda Sadeh <yehuda@redhat.com>
+                  Matt Benjamin <mbenjamin@redhat.com>
+CephFS          - John Spray <jspray@redhat.com>
+CephFS (kernel) - Yan, Zheng <zyan@redhat.com>
+Deployment      - Alfredo Deza <adeza@redhat.com>
+Teuthology      - Zack Cerza <zack@redhat.com>
+Calamari        - Gregory Meno <gmeno@redhat.com>
+Chef Cookbook   - Guilhem Lettron <guilhem@lettron.fr>
 
 
 Contributors