aboutsummaryrefslogtreecommitdiff
path: root/.mailmap
AgeCommit message (Collapse)AuthorFilesLines
2016-08-17MAINTAINERS: Switch to kernel.org account for Krzysztof KozlowskiKrzysztof Kozlowski1-0/+1
Change my email address to kernel.org account instead of Samsung one. Add Bartlomiej Zolnierkiewicz as a co-maintainer of Maxim and Samsung PMIC drivers. These are used on many of our boards along with Exynos SoCs and Samsung R&D Institute Poland can still take care of them. Signed-off-by: Krzysztof Kozlowski <[email protected]> Cc: Kukjin Kim <[email protected]> Cc: [email protected] Cc: Bartlomiej Zolnierkiewicz <[email protected]> Acked-by: Sylwester Nawrocki <[email protected]> Acked-by: Kukjin Kim <[email protected]>
2016-08-06Merge tag 'media/v4.8-6' of ↵Linus Torvalds1-2/+11
git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media Pull mailcap fixlets from Mauro Carvalho Chehab: "A small fixup for my and Shuah's entries in .mailcap. Basically, those entries were with a syntax that makes get_maintainer.pl to do the wrong thing" * tag 'media/v4.8-6' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: .mailmap: Correct entries for Mauro Carvalho Chehab and Shuah Khan
2016-08-04.mailmap: Correct entries for Mauro Carvalho Chehab and Shuah KhanJoe Perches1-2/+11
mailmap entries may not use more than 2 email addresses per line. Signed-off-by: Joe Perches <[email protected]> Acked-by: Shuah Khan <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
2016-08-02mailmap: add Linus LüssingLinus Lüssing1-0/+2
For one thing, summarizes all non-umlaut versions into the umlaut one (Linus Luessing -> Linus Lüssing). For another, maps obsolete email addresses to the current @c0d3.blue one. Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Linus Lüssing <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2016-07-04Merge 4.7-rc6 into staging-nextGreg Kroah-Hartman1-0/+4
We want the staging fixes in here as well. Signed-off-by: Greg Kroah-Hartman <[email protected]>
2016-06-29Merge tag 'iio-for-4.8b' of ↵Greg Kroah-Hartman1-0/+3
git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next Jonathan writes: Second round of new iio device support, features and cleanups in the 4.8 cycle Firstly some contact detail updates: * NXP took over freescale. Update the mma8452 header to reflect this. * Martin Kepplinger email address change in mma8452 header. * Adriana Reus has changed email address. Update .mailmap. * Matt Ranostay has changed email address. Update .mailmap. New Device Support * max1363 - add the missing i2c_device_ids for a couple of parts so they can actually be used. * ms5867 - add device ids for ms5805 and ms5837 parts. New Features * ad5755 - DT support. This one was a bit controversial and under review for a long time. Still no one could come up with a better solution. * stx104 - add gpio support * ti-adc081c - Add ACPI device ID matching. Core changes * Refuse to register triggers with duplicate names. There is no way to distinguish between them so this makes no sense. A few drivers do not generate unique names for each instance of the device present. We can't fix this without changing ABI so leave them and wait for someone to actually take the rare step of two identical accelerometers on the same board. * buffer-dma - use ARRAY_SIZE in a few appropriate locations. Tools * Fix the fact that the --trigger-num option in generic_buffer didn't allow 0 which is perfectly valid in the ABI. Cleanups * as3935 - improve error reporting. - remove redundant zeroing of a field in iio_priv. * gp2ap020a00f - use the iio_device_claim_*_mode helpers rather than open coding locking around mode changes. * isl29125 - use the iio_device_claim_*_mode helpers rather than open coding locking. * lidar - use the iio_device_claim_*_mode helpers rather than open coding locking. * mma8452 - more detail in devices supported description in comments (addresses and similar) * sca3000 - add a missing error check. * tcs3414 - use the iio_device_claim_*_mode helpers rather than open coding locking. * tcs3472 - use the iio_device_claim_*_mode helpers rather than open coding locking.
2016-06-24mailmap: add Boris Brezillon's emailAntoine Tenart1-0/+3
There are different versions of Boris' name and email in the log, and one typo. Add his emails in mailmap to have all of his contributions under the same name/email tuple. Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Antoine Tenart <[email protected]> Acked-by: Boris Brezillon <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2016-06-24mailmap: add Antoine Tenart's emailAntoine Tenart1-0/+1
I used "Antoine Ténart" at first but then moved to a name without accent as this cause some issues from time to time... Add my email in the mailmap file to have a consistent shortlog output. Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Antoine Tenart <[email protected]> Cc: Antoine Tenart <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2016-06-15Update email addresses in MAINTAINERS and .mailmapShuah Khan1-0/+1
Updating email addresses in MAINTAINERS and .mailmap files. Cc: [email protected] Signed-off-by: Shuah Khan <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2016-06-15Update my main e-mails at the Kernel treeMauro Carvalho Chehab1-0/+1
For the third time in three years, I'm changing my e-mail at Samsung. That's bad, as it may stop communications with me for a while. So, this time, I'll also add the [email protected] e-mail, as it remains stable since ever. Cc: [email protected] Signed-off-by: Mauro Carvalho Chehab <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2016-06-11mailmap: update Matt Ranostay email addressMatt Ranostay1-0/+2
Set current email address to replace previous employers email addresses. Cc: Jonathan Cameron <[email protected]> Cc: Daniel Baluta <[email protected]> Cc: [email protected] Signed-off-by: Matt Ranostay <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2016-06-11mailmap: update Adriana Reus email addressAdriana Reus1-0/+1
Set current email address instead of previous employers email address. Signed-off-by: Adriana Reus <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
2016-05-05mailmap: add John Paul Adrian GlaubitzLinus Torvalds1-0/+1
Apparently patchwork ended up truncating the full name. Signed-off-by: Linus Torvalds <[email protected]>
2016-04-28.mailmap: add Frank RowandFrank Rowand1-0/+3
Set current email address to replace obsolete email addresses. Signed-off-by: Frank Rowand <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2016-04-28mailmap: fix Krzysztof Kozlowski's misspelled nameKrzysztof Kozlowski1-0/+1
Patchwork introduced a garbled Polish character in commit 1e3012d0fdc5 ("crypto: s5p-sss - Use memcpy_toio for iomem annotated memory") so fix the mail mapping. Additionally prefer to use kernel.org account for personal work, instead of my gmail address. Signed-off-by: Krzysztof Kozlowski <[email protected]> Cc: Herbert Xu <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2016-04-01.mailmap: add Christophe RicardChristophe Ricard1-0/+1
Different computers had different settings in the mail client. Some contributions appear as Christophe Ricard, others as Christophe RICARD. Signed-off-by: Christophe Ricard <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2016-01-27mailmap: redirect inactive address <[email protected]>Antonio Ospite1-0/+1
The email address <[email protected]> is not active anymore, use Antonio's personal email address <[email protected]> in case someone wants to get in touch for the code wrote for Amarula Solutions. Signed-off-by: Antonio Ospite <[email protected]> Cc: Michael Trimarchi <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2015-10-23mailmap: update Javier Martinez Canillas' emailJavier Martinez Canillas1-0/+1
The get_maintainer script still reports my old Collabora email based on old commits but that address no longer exist so update mailmap to report my current email and avoid people sending to the old address. Signed-off-by: Javier Martinez Canillas <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2015-08-14.mailmap: Andrey Ryabinin has movedAndrey Ryabinin1-0/+1
Update my email address. Signed-off-by: Andrey Ryabinin <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2015-07-17mailmap: update Sudeep Holla's email idSudeep Holla1-0/+1
Since the get_maintainer script still reports my old email id based on few old commits, update mailmap to report new/updated address. It also helps to fix email address for 'git shortlog' Signed-off-by: Sudeep Holla <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2015-07-17Update Viresh Kumar's email addressViresh Kumar1-1/+3
Switch to my kernel.org alias instead of a badly named gmail address, which I rarely use. Signed-off-by: Viresh Kumar <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2015-06-25mailmap: add rdunlap email auto-correctionKees Cook1-0/+1
To avoid having xenotime bounce when things like get_maintainers gives me addresses, add Randy's current address. Signed-off-by: Kees Cook <[email protected]> Acked-by: Randy Dunlap <[email protected]> Cc: Joe Perches <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2015-06-25Mohit Kumar has movedPratyush Anand1-0/+1
Mohit's email-id doesn't exist anymore as he has left the company. Replace ST's id with [email protected]. Signed-off-by: Pratyush Anand <[email protected]> Cc: Mohit Kumar <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2015-06-25Pratyush Anand has movedPratyush Anand1-0/+1
[email protected] email-id doesn't exist anymore as I have left the company. Replace ST's id with [email protected]. Signed-off-by: Pratyush Anand <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2015-04-15.mailmap: add Ricardo RibaldaRicardo Ribalda Delgado1-0/+1
Work and Home computer had different settings in the mail client. Some contributions appear as Ricardo Ribalda, others as Ricardo Ribalda Delgado (and one as just Ricardo). Signed-off-by: Ricardo Ribalda Delgado <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2015-02-05.mailmap: update Konstantin Khlebnikov's email addressKim Phillips1-0/+1
get_maintainer.pl returns [email protected] via git history, for which emails get rejected: RCPT TO:<[email protected]> 550 5.1.1 Recipient address rejected: User unknown Use his other address that passes vger's mxverify: RCPT TO:<[email protected]> 250 2.1.5 OK ir10si13843754pbc.62 - gsmtp and add his old email address in the wrong email address field. Signed-off-by: Kim Phillips <[email protected]> Acked-by: Konstantin Khlebnikov <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2015-01-08MAINTAINERS: update rydberg's addressesHenrik Rydberg1-0/+1
My ISP finally gave up on the old mail address, so I am moving things over to bitmath.org instead. Also change the status fields to better reflect reality. Signed-off-by: Henrik Rydberg <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-18.mailmap: Santosh Shilimkar has movedSantosh Shilimkar1-0/+2
Add my new email address along with kernel.org email id Signed-off-by: Santosh Shilimkar <[email protected]> Signed-off-by: Santosh Shilimkar <[email protected]> Cc: Joe Perches <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-12-18.mailmap: update [email protected]Andrew Morton1-1/+1
Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-07-30Josh has movedJosh Triplett1-0/+5
My IBM email addresses haven't worked for years; also map some old-but-functional forwarding addresses to my canonical address. Update my GPG key fingerprint; I moved to 4096R a long time ago. Update description. Signed-off-by: Josh Triplett <[email protected]> Cc: "Paul E. McKenney" <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2014-04-18Shiraz has movedViresh Kumar1-0/+1
[email protected] email-id doesn't exist anymore as he has left the company. Replace ST's id with [email protected]. It also updates .mailmap file to fix address for 'git shortlog'. Signed-off-by: Viresh Kumar <[email protected]> Cc: Shiraz Hashim <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2012-06-20Viresh has movedViresh Kumar1-0/+1
[email protected] email-id doesn't exist anymore as I have left the company. Replace ST's id with [email protected]. It also updates .mailmap file to fix address for 'git shortlog' Signed-off-by: Viresh Kumar <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2012-05-31.mailmap: add GustavoGustavo Padovan1-0/+2
Signed-off-by: Gustavo Padovan <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-11-11mailmap: Fix up some renesas attributionsKuninori Morimoto1-0/+2
This adds in entries for both Goda and Morimoto-san who have previously used different conventions. Cc: Yusuke Goda <[email protected]> Signed-off-by: Kuninori Morimoto <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2011-07-07Update my e-mail addressMichael Büsch1-2/+1
Signed-off-by: Michael Buesch <[email protected]> Signed-off-by: Jiri Kosina <[email protected]>
2011-05-24mailmap: Add entry for Damian Hobson-Garcia.Paul Mundt1-0/+1
Signed-off-by: Paul Mundt <[email protected]>
2011-03-22mailmap: Update for OMAP DSS developers.Paul Mundt1-0/+4
TI folks seem to have a rather schizophrenic relationship with author naming conventions, stub in mailmap entries to match with the sign-off convention. Signed-off-by: Paul Mundt <[email protected]>
2011-01-25mailmap: Add an entry for Axel Lin.Paul Mundt1-0/+1
Not all of Axel's patches have used a consistent casing, so fix it up here. Signed-off-by: Paul Mundt <[email protected]>
2010-11-24mailmap: Fix up Takashi YOSHII's attribution.Paul Mundt1-0/+1
Signed-off-by: Paul Mundt <[email protected]>
2009-02-06Add Sascha Hauer to .mailmapUwe Kleine-König1-0/+1
This fixes the shortlog attribution e.g. for 106757b38fff Signed-off-by: Uwe Kleine-König <[email protected]> Acked-by: Sascha Hauer <[email protected]> Acked-by: Wolfram Sang <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2009-02-06add another mailmap entry for Uwe Kleine-KönigUwe Kleine-König1-1/+2
I created commit 7971db5a4b4176ad5df590fce07a962c643a2740 on a machine where I forgot to set user.name and user.email before. The default values were not optimal. Signed-off-by: Uwe Kleine-König <[email protected]> Acked-by: Wolfram Sang <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2009-01-06Dmitry has been renamedDmitry Eremin-Solenikov1-0/+1
My surname has changed due to marriage. Change MAINTAINERS entry and add .mailmap entry to reflect that. Signed-off-by: Dmitry Eremin-Solenikov <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-10-28mailmap: add Peter OrubaPeter Oruba1-0/+2
Signed-off-by: Peter Oruba <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
2008-10-20mailmap: add Mark BrownMark Brown1-0/+1
A couple of commits have a broken real name - fix them up. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-09-13Add Uwe Kleine-König to .mailmapUwe Kleine-König1-0/+2
There are a few commits that misencoded my name (or used "oe" instead of "ö"). So add a correct version to .mailmap. Signed-off-by: Uwe Kleine-König <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2008-04-30Update .mailmapS.Çağlar Onur1-0/+1
I realize some of the maintainers email clients and/or scripts cannot handle UTF-8 encoded names properly, as a result your ChangeLogs displays me as two different person :). Following patch adds correctly encoded name of mine into .mailmap, to prevent appearing it not to be so or badly displayed. Signed-off-by: S.Çağlar Onur <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2007-04-24Add mbuesch to .mailmapMichael Buesch1-0/+2
Signed-off-by: Michael Buesch <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2007-02-14[PATCH] add .mailmap for proper git-shortlog outputNicolas Pitre1-0/+96
This list was built into the git-shortlog tool and has been removed in the latest version. It should be maintained separately so this is what this patch does. A couple more entries were added to the original list as well. Signed-off-by: Nicolas Pitre <[email protected]> Acked-by: Junio C Hamano <[email protected]> Cc: Linus Torvalds <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.