-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 - -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256
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 mche...@kernel.org e-mail, as it remains stable since ever. Cc: sta...@vger.kernel.org Signed-off-by: Mauro Carvalho Chehab <mche...@s-opensource.com> - --- PS.: 1) E-mail resent. I typed lkml@vger instead of l...@kernel.org. 2) The old e-mail is scheduled to be decommissioned by the end of this month, so please merge this patch also at the stable Kernel versions. diff --git a/.mailmap b/.mailmap index 08b80428f583..4a293bea648d 100644 - - --- a/.mailmap +++ b/.mailmap @@ -89,6 +89,7 @@ Leonid I Ananiev <leonid.i.anan...@intel.com> Linas Vepstas <li...@austin.ibm.com> Mark Brown <broo...@sirena.org.uk> Matthieu CASTET <castet.matth...@free.fr> +Mauro Carvalho Chehab <mche...@kernel.org> <mauroche...@gmail.com> <mche...@infradead.org> <mche...@redhat.com> <m.che...@samsung.com> <mche...@osg.samsung.com> <mche...@s-opensource.com> Mayuresh Janorkar <ma...@ti.com> Michael Buesch <m...@bues.ch> Michel Dänzer <mic...@tungstengraphics.com> diff --git a/CREDITS b/CREDITS index 0f0bf22afe0c..2a3fbcd229e6 100644 - - --- a/CREDITS +++ b/CREDITS @@ -649,6 +649,7 @@ D: Configure, Menuconfig, xconfig N: Mauro Carvalho Chehab E: m.che...@samsung.org +E: mche...@osg.samsung.com E: mche...@infradead.org D: Media subsystem (V4L/DVB) drivers and core D: EDAC drivers and EDAC 3.0 core rework diff --git a/MAINTAINERS b/MAINTAINERS index 45fad6cecc88..02299fd2db18 100644 - - --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2242,7 +2242,8 @@ F: include/net/ax25.h F: net/ax25/ AZ6007 DVB DRIVER - - -M: Mauro Carvalho Chehab <mche...@osg.samsung.com> +M: Mauro Carvalho Chehab <mche...@s-opensource.com> +M: Mauro Carvalho Chehab <mche...@kernel.org> L: linux-media@vger.kernel.org W: https://linuxtv.org T: git git://linuxtv.org/media_tree.git @@ -2709,7 +2710,8 @@ F: Documentation/filesystems/btrfs.txt F: fs/btrfs/ BTTV VIDEO4LINUX DRIVER - - -M: Mauro Carvalho Chehab <mche...@osg.samsung.com> +M: Mauro Carvalho Chehab <mche...@s-opensource.com> +M: Mauro Carvalho Chehab <mche...@kernel.org> L: linux-media@vger.kernel.org W: https://linuxtv.org T: git git://linuxtv.org/media_tree.git @@ -3343,7 +3345,8 @@ S: Maintained F: drivers/media/dvb-frontends/cx24120* CX88 VIDEO4LINUX DRIVER - - -M: Mauro Carvalho Chehab <mche...@osg.samsung.com> +M: Mauro Carvalho Chehab <mche...@s-opensource.com> +M: Mauro Carvalho Chehab <mche...@kernel.org> L: linux-media@vger.kernel.org W: https://linuxtv.org T: git git://linuxtv.org/media_tree.git @@ -4290,7 +4293,8 @@ F: fs/ecryptfs/ EDAC-CORE M: Doug Thompson <dougthomp...@xmission.com> M: Borislav Petkov <b...@alien8.de> - - -M: Mauro Carvalho Chehab <mche...@osg.samsung.com> +M: Mauro Carvalho Chehab <mche...@s-opensource.com> +M: Mauro Carvalho Chehab <mche...@kernel.org> L: linux-e...@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git for-next T: git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git linux_next @@ -4335,7 +4339,8 @@ S: Maintained F: drivers/edac/e7xxx_edac.c EDAC-GHES - - -M: Mauro Carvalho Chehab <mche...@osg.samsung.com> +M: Mauro Carvalho Chehab <mche...@s-opensource.com> +M: Mauro Carvalho Chehab <mche...@kernel.org> L: linux-e...@vger.kernel.org S: Maintained F: drivers/edac/ghes_edac.c @@ -4359,19 +4364,22 @@ S: Maintained F: drivers/edac/i5000_edac.c EDAC-I5400 - - -M: Mauro Carvalho Chehab <mche...@osg.samsung.com> +M: Mauro Carvalho Chehab <mche...@s-opensource.com> +M: Mauro Carvalho Chehab <mche...@kernel.org> L: linux-e...@vger.kernel.org S: Maintained F: drivers/edac/i5400_edac.c EDAC-I7300 - - -M: Mauro Carvalho Chehab <mche...@osg.samsung.com> +M: Mauro Carvalho Chehab <mche...@s-opensource.com> +M: Mauro Carvalho Chehab <mche...@kernel.org> L: linux-e...@vger.kernel.org S: Maintained F: drivers/edac/i7300_edac.c EDAC-I7CORE - - -M: Mauro Carvalho Chehab <mche...@osg.samsung.com> +M: Mauro Carvalho Chehab <mche...@s-opensource.com> +M: Mauro Carvalho Chehab <mche...@kernel.org> L: linux-e...@vger.kernel.org S: Maintained F: drivers/edac/i7core_edac.c @@ -4408,7 +4416,8 @@ S: Maintained F: drivers/edac/r82600_edac.c EDAC-SBRIDGE - - -M: Mauro Carvalho Chehab <mche...@osg.samsung.com> +M: Mauro Carvalho Chehab <mche...@s-opensource.com> +M: Mauro Carvalho Chehab <mche...@kernel.org> L: linux-e...@vger.kernel.org S: Maintained F: drivers/edac/sb_edac.c @@ -4467,7 +4476,8 @@ S: Maintained F: drivers/net/ethernet/ibm/ehea/ EM28XX VIDEO4LINUX DRIVER - - -M: Mauro Carvalho Chehab <mche...@osg.samsung.com> +M: Mauro Carvalho Chehab <mche...@s-opensource.com> +M: Mauro Carvalho Chehab <mche...@kernel.org> L: linux-media@vger.kernel.org W: https://linuxtv.org T: git git://linuxtv.org/media_tree.git @@ -7371,7 +7381,8 @@ S: Supported F: drivers/media/pci/netup_unidvb/* MEDIA INPUT INFRASTRUCTURE (V4L/DVB) - - -M: Mauro Carvalho Chehab <mche...@osg.samsung.com> +M: Mauro Carvalho Chehab <mche...@s-opensource.com> +M: Mauro Carvalho Chehab <mche...@kernel.org> P: LinuxTV.org Project L: linux-media@vger.kernel.org W: https://linuxtv.org @@ -9863,7 +9874,8 @@ S: Odd Fixes F: drivers/media/i2c/saa6588* SAA7134 VIDEO4LINUX DRIVER - - -M: Mauro Carvalho Chehab <mche...@osg.samsung.com> +M: Mauro Carvalho Chehab <mche...@s-opensource.com> +M: Mauro Carvalho Chehab <mche...@kernel.org> L: linux-media@vger.kernel.org W: https://linuxtv.org T: git git://linuxtv.org/media_tree.git @@ -10382,7 +10394,8 @@ S: Maintained F: drivers/media/radio/si4713/radio-usb-si4713.c SIANO DVB DRIVER - - -M: Mauro Carvalho Chehab <mche...@osg.samsung.com> +M: Mauro Carvalho Chehab <mche...@s-opensource.com> +M: Mauro Carvalho Chehab <mche...@kernel.org> L: linux-media@vger.kernel.org W: https://linuxtv.org T: git git://linuxtv.org/media_tree.git @@ -11148,7 +11161,8 @@ S: Maintained F: drivers/media/i2c/tda9840* TEA5761 TUNER DRIVER - - -M: Mauro Carvalho Chehab <mche...@osg.samsung.com> +M: Mauro Carvalho Chehab <mche...@s-opensource.com> +M: Mauro Carvalho Chehab <mche...@kernel.org> L: linux-media@vger.kernel.org W: https://linuxtv.org T: git git://linuxtv.org/media_tree.git @@ -11156,7 +11170,8 @@ S: Odd fixes F: drivers/media/tuners/tea5761.* TEA5767 TUNER DRIVER - - -M: Mauro Carvalho Chehab <mche...@osg.samsung.com> +M: Mauro Carvalho Chehab <mche...@s-opensource.com> +M: Mauro Carvalho Chehab <mche...@kernel.org> L: linux-media@vger.kernel.org W: https://linuxtv.org T: git git://linuxtv.org/media_tree.git @@ -11543,7 +11558,8 @@ F: include/linux/shmem_fs.h F: mm/shmem.c TM6000 VIDEO4LINUX DRIVER - - -M: Mauro Carvalho Chehab <mche...@osg.samsung.com> +M: Mauro Carvalho Chehab <mche...@s-opensource.com> +M: Mauro Carvalho Chehab <mche...@kernel.org> L: linux-media@vger.kernel.org W: https://linuxtv.org T: git git://linuxtv.org/media_tree.git @@ -12529,7 +12545,8 @@ S: Maintained F: arch/x86/entry/vdso/ XC2028/3028 TUNER DRIVER - - -M: Mauro Carvalho Chehab <mche...@osg.samsung.com> +M: Mauro Carvalho Chehab <mche...@s-opensource.com> +M: Mauro Carvalho Chehab <mche...@kernel.org> L: linux-media@vger.kernel.org W: https://linuxtv.org T: git git://linuxtv.org/media_tree.git diff --git a/drivers/media/v4l2-core/v4l2-mc.c b/drivers/media/v4l2-core/v4l2-mc.c index ca94bded3386..8bef4331bd51 100644 - - --- a/drivers/media/v4l2-core/v4l2-mc.c +++ b/drivers/media/v4l2-core/v4l2-mc.c @@ -1,7 +1,7 @@ /* * Media Controller ancillary functions * - - - * Copyright (c) 2016 Mauro Carvalho Chehab <mche...@osg.samsung.com> + * Copyright (c) 2016 Mauro Carvalho Chehab <mche...@kernel.org> * Copyright (C) 2016 Shuah Khan <shua...@osg.samsung.com> * Copyright (C) 2006-2010 Nokia Corporation * Copyright (c) 2016 Intel Corporation. diff --git a/include/media/v4l2-mc.h b/include/media/v4l2-mc.h index 98a938aabdfb..7a8d6037a4bb 100644 - - --- a/include/media/v4l2-mc.h +++ b/include/media/v4l2-mc.h @@ -1,7 +1,7 @@ /* * v4l2-mc.h - Media Controller V4L2 types and prototypes * - - - * Copyright (C) 2016 Mauro Carvalho Chehab <mche...@osg.samsung.com> + * Copyright (C) 2016 Mauro Carvalho Chehab <mche...@kernel.org> * Copyright (C) 2006-2010 Nokia Corporation * Copyright (c) 2016 Intel Corporation. * -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXYEpEAAoJEAhfPr2O5OEVd3YP/2SFl0+kFSk3sOUSiovJQaEi 28+k5N/W67Y8XLb6B9rTy5ZgsPc8CcfbpU+Rs+JPSALOBNNiVRdyqb53/WcvNDce 6aVjpEHsZwCc8ScAFn3REFUCOYPooUYzOsFUPRuST6RUSENFDiM3JjFtwXkp9l85 QKXrw4o70ki8VPJIHI9j/f+MPUDfubClnpAcC9iVFLc9IZm9mr8c1h5D6+B5rtDn SpFayjS5E8l3VIXTeSGwRVfyKMgw/iYeifKQyF8Tx4zyLwvppqLVcVbCanSAVifU qQX2pP7x8x2SBhX0JAZPJzBAFOzE+9ADzlKE+b1rKpbf2zNGp7KAQRL9vzovwuRT NfOUkmeW+GkMbPxfanq7+tDp3Zlj+VzRX3kHmxOLr6CZeL1UW0RnrKmDuS4oxfh9 V2AM571ZGpKX6LedXFQKtvPGVaEquiMFfI2rB6Qt9feolGNgS5xMM6lYWfXxmBd0 Z0FomY4HwU6B2CDaj+giIPlQsz98czFr3rWEAX26WZu9Ml6YxvsM647P7i0M2Qrc /BvqLlsU6bI4HPzk+3nBQDpr8tZZjPTE6zoyiA53kmzj4zK4PFOMnqaM0dOjPrCq cjdyYxww89NECnvLHqQDNuKniAKduwYeYNf+tgpABCGyFPqaV74MtixZItQQ6tSV zq21udqB3HLrrNIAhzA+ =wCjM -----END PGP SIGNATURE----- N�����r��y����b�X��ǧv�^�){.n�+����{���bj)����w* jg��� �����ݢj/���z�ޖ��2�ޙ����&�)ߡ�a���� �G���h��j:+v���w��٥
