Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b99dc742 authored May 04, 2018 by Linus Torvalds

Merge tag 'media/v4.17-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media fixes from Mauro Carvalho Chehab:

 - a trivial one-line fix addressing a PTR_ERR() getting value from a
   wrong var at imx driver

 - a patch changing my e-mail at the Kernel tree to mchehab@kernel.org.
   no code changes

* tag 'media/v4.17-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  MAINTAINERS & files: Canonize the e-mails I use at files
  media: imx-media-csi: Fix inconsistent IS_ERR and PTR_ERR

parents dac1acc3 32590819

Documentation/doc-guide/parse-headers.rst

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -177,14 +177,14 @@ BUGS
	****		****


	Report bugs to Mauro Carvalho Chehab <mchehab@s-opensource.com>		Report bugs to Mauro Carvalho Chehab <mchehab@kernel.org>


	COPYRIGHT		COPYRIGHT
	*********		*********


	Copyright (c) 2016 by Mauro Carvalho Chehab <mchehab@s-opensource.com>.		Copyright (c) 2016 by Mauro Carvalho Chehab <mchehab+samsung@kernel.org>.

	License GPLv2: GNU GPL version 2 <http://gnu.org/licenses/gpl.html>.		License GPLv2: GNU GPL version 2 <http://gnu.org/licenses/gpl.html>.

Documentation/media/uapi/rc/keytable.c.rst

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -7,7 +7,7 @@ file: uapi/v4l/keytable.c

	/* keytable.c - This program allows checking/replacing keys at IR		/* keytable.c - This program allows checking/replacing keys at IR

	Copyright (C) 2006-2009 Mauro Carvalho Chehab <mchehab@infradead.org>		Copyright (C) 2006-2009 Mauro Carvalho Chehab <mchehab@kernel.org>

	This program is free software; you can redistribute it and/or modify		This program is free software; you can redistribute it and/or modify
	it under the terms of the GNU General Public License as published by		it under the terms of the GNU General Public License as published by

Documentation/media/uapi/v4l/v4l2grab.c.rst

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -6,7 +6,7 @@ file: media/v4l/v4l2grab.c
	.. code-block:: c		.. code-block:: c

	/* V4L2 video picture grabber		/* V4L2 video picture grabber
	Copyright (C) 2009 Mauro Carvalho Chehab <mchehab@infradead.org>		Copyright (C) 2009 Mauro Carvalho Chehab <mchehab@kernel.org>

	This program is free software; you can redistribute it and/or modify		This program is free software; you can redistribute it and/or modify
	it under the terms of the GNU General Public License as published by		it under the terms of the GNU General Public License as published by

Documentation/sphinx/parse-headers.pl

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -387,11 +387,11 @@ tree for more details.

	=head1 BUGS		=head1 BUGS

	Report bugs to Mauro Carvalho Chehab <mchehab@s-opensource.com>		Report bugs to Mauro Carvalho Chehab <mchehab@kernel.org>

	=head1 COPYRIGHT		=head1 COPYRIGHT

	Copyright (c) 2016 by Mauro Carvalho Chehab <mchehab@s-opensource.com>.		Copyright (c) 2016 by Mauro Carvalho Chehab <mchehab+samsung@kernel.org>.

	License GPLv2: GNU GPL version 2 <http://gnu.org/licenses/gpl.html>.		License GPLv2: GNU GPL version 2 <http://gnu.org/licenses/gpl.html>.

Documentation/translations/zh_CN/video4linux/v4l2-framework.txt

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -6,7 +6,7 @@ communicating in English you can also ask the Chinese maintainer for
	help. Contact the Chinese maintainer if this translation is outdated		help. Contact the Chinese maintainer if this translation is outdated
	or if there is a problem with the translation.		or if there is a problem with the translation.

	Maintainer: Mauro Carvalho Chehab <mchehab@infradead.org>		Maintainer: Mauro Carvalho Chehab <mchehab@kernel.org>
	Chinese maintainer: Fu Wei <tekkamanninja@gmail.com>		Chinese maintainer: Fu Wei <tekkamanninja@gmail.com>
	---------------------------------------------------------------------		---------------------------------------------------------------------
	Documentation/video4linux/v4l2-framework.txt 的中文翻译		Documentation/video4linux/v4l2-framework.txt 的中文翻译
	@@ -14,7 +14,7 @@ Documentation/video4linux/v4l2-framework.txt 的中文翻译
	如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文		如果想评论或更新本文的内容，请直接联系原文档的维护者。如果你使用英文
	交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻		交流有困难的话，也可以向中文版维护者求助。如果本翻译更新不及时或者翻
	译存在问题，请联系中文版维护者。		译存在问题，请联系中文版维护者。
	英文版维护者： Mauro Carvalho Chehab <mchehab@infradead.org>		英文版维护者： Mauro Carvalho Chehab <mchehab@kernel.org>
	中文版维护者：傅炜 Fu Wei <tekkamanninja@gmail.com>		中文版维护者：傅炜 Fu Wei <tekkamanninja@gmail.com>
	中文版翻译者：傅炜 Fu Wei <tekkamanninja@gmail.com>		中文版翻译者：傅炜 Fu Wei <tekkamanninja@gmail.com>
	中文版校译者：傅炜 Fu Wei <tekkamanninja@gmail.com>		中文版校译者：傅炜 Fu Wei <tekkamanninja@gmail.com>