diff --git a/.mailmap b/.mailmap index 1d8f5ca29db..f1e64286a10 100644 --- a/.mailmap +++ b/.mailmap @@ -647,6 +647,7 @@ Jesper Wramberg Jesse Brandeburg Jesse Bruni Jia He +Jian Wang Jianbo Liu Jianfeng Tan Jiang Yu @@ -1380,6 +1381,7 @@ Souvik Dey Spike Du Sridhar Samudrala Sriharsha Basavapatna +Srikanth Jampala Srikanth Yalavarthi Srinivas Narayan Srisivasubramanian Srinivasan @@ -1717,7 +1719,7 @@ Zhihong Wang Zhike Wang Zhimin Huang Zhipeng Lu -Zhirun Yan +Zhirun Yan Zhiwei He Zhiyong Yang Zhuobin Huang diff --git a/devtools/check-maintainers.sh b/devtools/check-maintainers.sh index 71697bb352d..8a786e14a97 100755 --- a/devtools/check-maintainers.sh +++ b/devtools/check-maintainers.sh @@ -85,6 +85,18 @@ check_fx () # done } +# Check that every maintainer mail is known of .mailmap: +check_mailmap () # +{ + sed -n -e 's/^M: \(.*<.*\)$/\1/p' $1 | sort -u | while read line; do + name=${line%% <*} + mail='<'${line##* <} + if ! grep -q "^$name <" $2 || ! grep -iq "^$name.*$mail" $2; then + echo $name mail address $mail is not in $2 + fi + done +} + # Add a line to a set of lines if it begins with right pattern add_line_to_if () # { @@ -129,4 +141,10 @@ echo '# wrong patterns' echo '##########' check_fx MAINTAINERS +echo +echo '##########' +echo '# wrong mailmap' +echo '##########' +check_mailmap MAINTAINERS .mailmap + # TODO: check overlaps