linux-kernel - [PATCH] .mailmap: Correct entries for Mauro Carvalho Chehab and Shuah Khan

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <8b6bb8f71711ea58ef25fef45ec487e4530a0f0e.1470287666.git.joe@perches.com>
Date:	Wed,  3 Aug 2016 22:16:43 -0700
From:	Joe Perches <joe@...ches.com>
To:	Andrew Morton <akpm@...ux-foundation.org>,
	linux-kernel@...r.kernel.org
Cc:	Mauro Carvalho Chehab <mchehab@...nel.org>,
	Shuah Khan <shuah@...nel.org>
Subject: [PATCH] .mailmap: Correct entries for Mauro Carvalho Chehab and Shuah Khan

mailmap entries may not use more than 2 email addresses per line.

Signed-off-by: Joe Perches <joe@...ches.com>
---
 .mailmap | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index c0d5704..2a91c14c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -96,7 +96,13 @@ Linus Lüssing <linus.luessing@...3.blue> <linus.luessing@....de>
 Linus Lüssing <linus.luessing@...3.blue> <linus.luessing@...om.ch>
 Mark Brown <broonie@...ena.org.uk>
 Matthieu CASTET <castet.matthieu@...e.fr>
-Mauro Carvalho Chehab <mchehab@...nel.org> <maurochehab@...il.com> <mchehab@...radead.org> <mchehab@...hat.com> <m.chehab@...sung.com> <mchehab@....samsung.com> <mchehab@...pensource.com>
+Mauro Carvalho Chehab <mchehab@...nel.org> <mchehab@...urbo.com.br>
+Mauro Carvalho Chehab <mchehab@...nel.org> <maurochehab@...il.com>
+Mauro Carvalho Chehab <mchehab@...nel.org> <mchehab@...radead.org>
+Mauro Carvalho Chehab <mchehab@...nel.org> <mchehab@...hat.com>
+Mauro Carvalho Chehab <mchehab@...nel.org> <m.chehab@...sung.com>
+Mauro Carvalho Chehab <mchehab@...nel.org> <mchehab@....samsung.com>
+Mauro Carvalho Chehab <mchehab@...nel.org> <mchehab@...pensource.com>
 Matt Ranostay <mranostay@...il.com> Matthew Ranostay <mranostay@...eddedalley.com>
 Matt Ranostay <mranostay@...il.com> <matt.ranostay@...el.com>
 Mayuresh Janorkar <mayur@...com>
@@ -132,7 +138,10 @@ Santosh Shilimkar <santosh.shilimkar@...cle.org>
 Sascha Hauer <s.hauer@...gutronix.de>
 S.Çağlar Onur <caglar@...dus.org.tr>
 Shiraz Hashim <shiraz.linux.kernel@...il.com> <shiraz.hashim@...com>
-Shuah Khan <shuah@...nel.org> <shuahkhan@...il.com> <shuah.khan@...com> <shuahkh@....samsung.com> <shuah.kh@...sung.com>
+Shuah Khan <shuah@...nel.org> <shuahkhan@...il.com>
+Shuah Khan <shuah@...nel.org> <shuah.khan@...com>
+Shuah Khan <shuah@...nel.org> <shuahkh@....samsung.com>
+Shuah Khan <shuah@...nel.org> <shuah.kh@...sung.com>
 Simon Kelley <simon@...kelleys.org.uk>
 Stéphane Witzmann <stephane.witzmann@...mes.univ-bpclermont.fr>
 Stephen Hemminger <shemminger@...l.org>
-- 
2.8.0.rc4.16.g56331f8