mailmap: Shinobu Kinjo name normalization and affiliation (reverts a previous error)

Signed-off-by: Yann Dupont <yann@objoo.org>

diff --git a/.mailmap b/.mailmap
index fafda9fea0b70a84887438852b8177168dc5941b..c585840cffb7b357294be590b8c6613fc4090a99 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -309,7 +309,8 @@ Sergey Arkhipov <nineseconds@yandex.ru>
 Shanggao Qiu <qiushanggao@qq.com>
 Shawn Chen <cxwshawn@gmail.com>
 Shehbaz Jaffer <shehbaz.jaffer@mail.utoronto.ca> <shehbazjaffer007@gmail.com>
-Shinobu Kinjo <shinobu@linux.com> <ceph@ceph-stack.redhat.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>
 Shu, Xinxin <xinxin.shu@intel.com>
 Shun Song <song.shun3@zte.com.cn>

diff --git a/.organizationmap b/.organizationmap
index 240739a7ed3cc68c7e11b3adbb03c575bbef9fb7..b1e1be4a16c856ecba9977adf742c9fb3e08cf1d 100644 (file)
--- a/.organizationmap
+++ b/.organizationmap
@@ -348,6 +348,7 @@ Red Hat <contact@redhat.com> Samuel Just <sjust@redhat.com>
 Red Hat <contact@redhat.com> Sandon Van Ness <svanness@redhat.com>
 Red Hat <contact@redhat.com> Sébastien Han <shan@redhat.com>
 Red Hat <contact@redhat.com> Shilpa Jagannath <smanjara@redhat.com>
+Red Hat <contact@redhat.com> Shinobu Kinjo <shinobu@redhat.com>
 Red Hat <contact@redhat.com> Shylesh Kumar <shmohan@redhat.com>
 Red Hat <contact@redhat.com> Siddharth Sharma <siddharth@redhat.com>
 Red Hat <contact@redhat.com> Steven Dieffenbach <sdieffen@redhat.com>
@@ -423,7 +424,6 @@ The Linux Box <contact@linuxbox.com> Adam C. Emerson <aemerson@linuxbox.com>
 The Linux Box <contact@linuxbox.com> Ali Maredia <ali@linuxbox.com>
 The Linux Box <contact@linuxbox.com> Casey Bodley <casey@linuxbox.com>
 The Linux Box <contact@linuxbox.com> Matt Benjamin <matt@linuxbox.com>
-The Linux Foundation <info@linuxfoundation.org> Shinobu Kinjo <shinobu@linux.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>
 Ubuntu Kylin <contact@ubuntukylin.com> Min Chen <minchen@ubuntukylin.com>