staging/ipu3-imgu fixes
Subsystems (2)
cover staging/ipu3-imgu fixes
Hi Mauro,
These two patches should fix the most pressing issues, will send checkpatch.pl fixes later.
Sakari Ailus (2):
Documentation: staging/ipu3-imgu: Add license information
Documentation: staging/ipu3-imgu: Fix reference file name
Documentation/media/uapi/v4l/pixfmt-meta-intel-ipu3.rst | 9 ++++++++- Documentation/media/v4l-drivers/ipu3.rst | 4 +++- 2 files changed, 11 insertions(+), 2 deletions(-)
Signature · 1 line
2.11.0
PATCH 1/2 Documentation: staging/ipu3-imgu: Add license information
The driver documentation is under GPL v2 and the uAPI documentation under GNU FDL 1.1 (without invariant sections).
Signed-off-by Sakari Ailus <[email protected]>
--- Documentation/media/uapi/v4l/pixfmt-meta-intel-ipu3.rst | 9 ++++++++- Documentation/media/v4l-drivers/ipu3.rst | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-)
Documentation/media/uapi/v4l/pixfmt-meta-intel-ipu3.rst +8 -1
@@ -1,4 +1,11 @@ -.. -*- coding: utf-8; mode: rst -*- +.. Permission is granted to copy, distribute and/or modify this +.. document under the terms of the GNU Free Documentation License, +.. Version 1.1 or any later version published by the Free Software +.. Foundation, with no Invariant Sections, no Front-Cover Texts +.. and no Back-Cover Texts. A copy of the license is included at +.. Documentation/media/uapi/fdl-appendix.rst. +.. +.. TODO: replace it to GFDL-1.1-or-later WITH no-invariant-sections .. _v4l2-meta-fmt-params: .. _v4l2-meta-fmt-stat-3a:
Documentation/media/v4l-drivers/ipu3.rst +2 -0
@@ -1,3 +1,5 @@ +.. SPDX-License-Identifier: GPL-2.0 + .. include:: <isonum.txt> ===============================================================
Signature · 1 line
2.11.0
PATCH 1/1 Documentation: staging/ipu3-imgu: Add license information
The driver documentation is under GPL v2 and the uAPI documentation under GNU FDL 1.1+ (without invariant sections) or GPL v2.
Signed-off-by Sakari Ailus <[email protected]>
---
since v1
- Add GPL v2 for the uAPI docs as well
.../media/uapi/v4l/pixfmt-meta-intel-ipu3.rst | 25 +++++++++++++++++++++- Documentation/media/v4l-drivers/ipu3.rst | 2 ++ 2 files changed, 26 insertions(+), 1 deletion(-)
Documentation/media/uapi/v4l/pixfmt-meta-intel-ipu3.rst +24 -1
@@ -1,4 +1,27 @@ -.. -*- coding: utf-8; mode: rst -*- +.. This file is dual-licensed: you can use it either under the terms +.. of the GPL 2.0 or the GFDL 1.1+ license, at your option. Note that this +.. dual licensing only applies to this file, and not this project as a +.. whole. +.. +.. a) This file is free software; you can redistribute it and/or +.. modify it under the terms of the GNU General Public License version +.. 2.0 as published by the Free Software Foundation. +.. +.. This file is distributed in the hope that it will be useful, +.. but WITHOUT ANY WARRANTY; without even the implied warranty of +.. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. GNU General Public License version 2.0 for more details. +.. +.. Or, alternatively, +.. +.. b) Permission is granted to copy, distribute and/or modify this +.. document under the terms of the GNU Free Documentation License, +.. Version 1.1 or any later version published by the Free Software +.. Foundation, with no Invariant Sections, no Front-Cover Texts +.. and no Back-Cover Texts. A copy of the license is included at +.. Documentation/media/uapi/fdl-appendix.rst. +.. +.. TODO: replace it to GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections .. _v4l2-meta-fmt-params: .. _v4l2-meta-fmt-stat-3a:
Documentation/media/v4l-drivers/ipu3.rst +2 -0
@@ -1,3 +1,5 @@ +.. SPDX-License-Identifier: GPL-2.0 + .. include:: <isonum.txt> ===============================================================
Signature · 1 line
2.11.0
PATCH 2/2 Documentation: staging/ipu3-imgu: Fix reference file name
In reply to Sakari AilusThe intel-ipu3.h intended-to-be-uAPI header is currently under drivers/staging/media/ipu3/include/, not include/uapi/linux.
Signed-off-by Sakari Ailus <[email protected]>
--- Documentation/media/v4l-drivers/ipu3.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/media/v4l-drivers/ipu3.rst +1 -1
@@ -360,7 +360,7 @@ The source can be located under hal/intel directory. References ========== -.. [#f5] include/uapi/linux/intel-ipu3.h +.. [#f5] drivers/staging/media/ipu3/include/intel-ipu3.h .. [#f1] https://github.com/intel/nvt
Signature · 1 line
2.11.0