* Re: [PATCHv18 01/35] Documentation: v4l: document request API [not found] ` <20180814142047.93856-2-hverkuil@xs4all.nl> @ 2018-11-12 19:06 ` Thomas Gleixner 2018-11-18 13:52 ` Mauro Carvalho Chehab 0 siblings, 1 reply; 8+ messages in thread From: Thomas Gleixner @ 2018-11-12 19:06 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: linux-media, LKML, Alexandre Courbot, Hans Verkuil, Hans Verkuil, Greg KH, Kate Stewart, Linus Torvalds Folks, On Tue, 14 Aug 2018, Hans Verkuil wrote: > From: Alexandre Courbot <acourbot@chromium.org> > > Document the request API for V4L2 devices, and amend the documentation > of system calls influenced by it. > > Signed-off-by: Alexandre Courbot <acourbot@chromium.org> > Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> > Reviewed-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> > @@ -0,0 +1,65 @@ > +.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections It's nice that you try to use SPDX identifiers, but this is absolutely not how it works. We went great length to document how SPDX identifiers are to be used and checkpatch emits a warning on this patch as well. WARNING: 'SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections' is not supported in LICENSES/... It's well documented that the license text including metadata needs to be available in LICENSES. What you are doing here is just counterproductive. The SPDX work is done to help automated license compliance. But the SPDX id above is broken and will let tools fail. Even if we add the GFDL1.1 to LICENSES, it's still broken because there is no such exception 'no-invariant-section' and no, we are not going to create it just in the kernel without having sorted that with the SPDX folks first. Mauro, you wrote yourself in a reply to this patch: > Mental note: we'll need to push the no-invariant-sections upstream > before merging this there. and then you went and applied it nevertheless without talking to anyone who is involved with that SPDX effort of cleaning up the kernels licensing mess. I'm grumpy about that particularly because you are the first person who complains about legal implications which might affect you. But then you go and just ignore process and legal implications and push the crap into mainline. Please get this sorted ASAP. Thanks, tglx ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCHv18 01/35] Documentation: v4l: document request API 2018-11-12 19:06 ` [PATCHv18 01/35] Documentation: v4l: document request API Thomas Gleixner @ 2018-11-18 13:52 ` Mauro Carvalho Chehab 2018-11-23 9:51 ` Mauro Carvalho Chehab 0 siblings, 1 reply; 8+ messages in thread From: Mauro Carvalho Chehab @ 2018-11-18 13:52 UTC (permalink / raw) To: Thomas Gleixner Cc: linux-media, LKML, Alexandre Courbot, Hans Verkuil, Hans Verkuil, Greg KH, Kate Stewart, Linus Torvalds, Ben Hutchings Hi Thomas, Em Mon, 12 Nov 2018 11:06:43 -0800 (PST) Thomas Gleixner <tglx@linutronix.de> escreveu: > Folks, > > On Tue, 14 Aug 2018, Hans Verkuil wrote: > > From: Alexandre Courbot <acourbot@chromium.org> > > > > Document the request API for V4L2 devices, and amend the documentation > > of system calls influenced by it. > > > > Signed-off-by: Alexandre Courbot <acourbot@chromium.org> > > Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> > > Reviewed-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> > > > @@ -0,0 +1,65 @@ > > +.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections > > It's nice that you try to use SPDX identifiers, but this is absolutely not > how it works. > > We went great length to document how SPDX identifiers are to be used and > checkpatch emits a warning on this patch as well. > > WARNING: 'SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections' is not supported in LICENSES/... > > It's well documented that the license text including metadata needs to be > available in LICENSES. > > What you are doing here is just counterproductive. The SPDX work is done to > help automated license compliance. But the SPDX id above is broken and will > let tools fail. > > Even if we add the GFDL1.1 to LICENSES, it's still broken because there is > no such exception 'no-invariant-section' and no, we are not going to create > it just in the kernel without having sorted that with the SPDX folks first. I know, and, after talking with Kate about that, I actually opened a SPDX issue in Aug, 30: https://github.com/spdx/license-list-XML/issues/686 Btw, this is just the tip of the iceberg: I have another patchset pending adding the GFDL license to LICENSES and doing some changes that are required for Debian to be able to package the Kernel documentation: https://git.linuxtv.org/mchehab/experimental.git/log/?h=doc_license It starts with Ben's patch: "Documentation/media: uapi: Explicitly say there are no Invariant Sections" And tag media docs with SPDX headers. > Mauro, you wrote yourself in a reply to this patch: > > > Mental note: we'll need to push the no-invariant-sections upstream > > before merging this there. > > and then you went and applied it nevertheless without talking to anyone who > is involved with that SPDX effort of cleaning up the kernels licensing mess. Sorry, I ended by sleeping on this. This specific patch was on a separate topic branch. I completely forgot that this was waiting for SPDX committee feedback about how to use GFDL. > I'm grumpy about that particularly because you are the first person who > complains about legal implications which might affect you. > > But then you go and just ignore process and legal implications and push the > crap into mainline. > > Please get this sorted ASAP. It would be great to have an ETA from SPDX about how long they'll take to solve this issue. It has been about 2,5 months without any concrete way about how we should address it. I really don't want to add new documents at the media uAPI stuff (with is GFDL due to historical reasons) without make them also GPL. On the other hand, freezing API submissions to the media subsystem just due to the lack of proper SPDX support for GFDL seems plain wrong. Perhaps one workaround would be to explicitly not using the SPDX-License-Identifier, adding a longer licensing text that could later be replaced by a SPDX license (if they ever figure out how GFDL without invariants sections should be used). Something like: .. SPDX License for this file: GPL-2.0 OR GFDL-1.1-or-later .. .. For GPL-2.0, see LICENSES/preferred/GPL-2.0 .. .. For GFDL-1.1-or-later, see: .. .. 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. Will that work for you? If so, the patch solving the current issue is enclosed. I'll rebase my other SPDX patchset to use the same solution after we have an agreement on this. Thanks, Mauro media: mediactl docs: don't use SPDX for GFDL There is an open issue for using GFDL without invariant sections: https://github.com/spdx/license-list-XML/issues/686 So far, no progress. While we don't have it, we can't really use SPDX identifiers on media. So, replace them by a license text. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> diff --git a/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst b/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst index 0f8b31874002..60874a1f3d89 100644 --- a/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst +++ b/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst @@ -1,4 +1,15 @@ -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections +.. SPDX License for this file: GPL-2.0 OR GFDL-1.1-or-later +.. +.. For GPL-2.0, see LICENSES/preferred/GPL-2.0 +.. +.. For GFDL-1.1-or-later, see: +.. +.. 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. .. _media_ioc_request_alloc: diff --git a/Documentation/media/uapi/mediactl/media-request-ioc-queue.rst b/Documentation/media/uapi/mediactl/media-request-ioc-queue.rst index 6dd2d7fea714..3f481256f75a 100644 --- a/Documentation/media/uapi/mediactl/media-request-ioc-queue.rst +++ b/Documentation/media/uapi/mediactl/media-request-ioc-queue.rst @@ -1,4 +1,15 @@ -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections +.. SPDX License for this file: GPL-2.0 OR GFDL-1.1-or-later +.. +.. For GPL-2.0, see LICENSES/preferred/GPL-2.0 +.. +.. For GFDL-1.1-or-later, see: +.. +.. 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. .. _media_request_ioc_queue: diff --git a/Documentation/media/uapi/mediactl/media-request-ioc-reinit.rst b/Documentation/media/uapi/mediactl/media-request-ioc-reinit.rst index febe888494c8..d9c4d308b477 100644 --- a/Documentation/media/uapi/mediactl/media-request-ioc-reinit.rst +++ b/Documentation/media/uapi/mediactl/media-request-ioc-reinit.rst @@ -1,4 +1,15 @@ -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections +.. SPDX License for this file: GPL-2.0 OR GFDL-1.1-or-later +.. +.. For GPL-2.0, see LICENSES/preferred/GPL-2.0 +.. +.. For GFDL-1.1-or-later, see: +.. +.. 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. .. _media_request_ioc_reinit: diff --git a/Documentation/media/uapi/mediactl/request-api.rst b/Documentation/media/uapi/mediactl/request-api.rst index 5f4a23029c48..7a85b346db91 100644 --- a/Documentation/media/uapi/mediactl/request-api.rst +++ b/Documentation/media/uapi/mediactl/request-api.rst @@ -1,4 +1,15 @@ -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections +.. SPDX License for this file: GPL-2.0 OR GFDL-1.1-or-later +.. +.. For GPL-2.0, see LICENSES/preferred/GPL-2.0 +.. +.. For GFDL-1.1-or-later, see: +.. +.. 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. .. _media-request-api: diff --git a/Documentation/media/uapi/mediactl/request-func-close.rst b/Documentation/media/uapi/mediactl/request-func-close.rst index 098d7f2b9548..c85275a8870c 100644 --- a/Documentation/media/uapi/mediactl/request-func-close.rst +++ b/Documentation/media/uapi/mediactl/request-func-close.rst @@ -1,4 +1,15 @@ -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections +.. SPDX License for this file: GPL-2.0 OR GFDL-1.1-or-later +.. +.. For GPL-2.0, see LICENSES/preferred/GPL-2.0 +.. +.. For GFDL-1.1-or-later, see: +.. +.. 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. .. _request-func-close: diff --git a/Documentation/media/uapi/mediactl/request-func-ioctl.rst b/Documentation/media/uapi/mediactl/request-func-ioctl.rst index ff7b072a6999..8b69465bd2dd 100644 --- a/Documentation/media/uapi/mediactl/request-func-ioctl.rst +++ b/Documentation/media/uapi/mediactl/request-func-ioctl.rst @@ -1,4 +1,15 @@ -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections +.. SPDX License for this file: GPL-2.0 OR GFDL-1.1-or-later +.. +.. For GPL-2.0, see LICENSES/preferred/GPL-2.0 +.. +.. For GFDL-1.1-or-later, see: +.. +.. 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. .. _request-func-ioctl: diff --git a/Documentation/media/uapi/mediactl/request-func-poll.rst b/Documentation/media/uapi/mediactl/request-func-poll.rst index 85191254f381..8f58f9948cb6 100644 --- a/Documentation/media/uapi/mediactl/request-func-poll.rst +++ b/Documentation/media/uapi/mediactl/request-func-poll.rst @@ -1,4 +1,15 @@ -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections +.. SPDX License for this file: GPL-2.0 OR GFDL-1.1-or-later +.. +.. For GPL-2.0, see LICENSES/preferred/GPL-2.0 +.. +.. For GFDL-1.1-or-later, see: +.. +.. 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. .. _request-func-poll: ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCHv18 01/35] Documentation: v4l: document request API 2018-11-18 13:52 ` Mauro Carvalho Chehab @ 2018-11-23 9:51 ` Mauro Carvalho Chehab 2018-11-23 10:38 ` Thomas Gleixner 0 siblings, 1 reply; 8+ messages in thread From: Mauro Carvalho Chehab @ 2018-11-23 9:51 UTC (permalink / raw) To: Thomas Gleixner Cc: linux-media, LKML, Alexandre Courbot, Hans Verkuil, Hans Verkuil, Greg KH, Kate Stewart, Linus Torvalds, Ben Hutchings Thomas, Ping. Would the patch below work for you? Regards, Mauro Em Sun, 18 Nov 2018 11:52:15 -0200 Mauro Carvalho Chehab <mchehab@kernel.org> escreveu: > Hi Thomas, > > Em Mon, 12 Nov 2018 11:06:43 -0800 (PST) > Thomas Gleixner <tglx@linutronix.de> escreveu: > > > Folks, > > > > On Tue, 14 Aug 2018, Hans Verkuil wrote: > > > From: Alexandre Courbot <acourbot@chromium.org> > > > > > > Document the request API for V4L2 devices, and amend the documentation > > > of system calls influenced by it. > > > > > > Signed-off-by: Alexandre Courbot <acourbot@chromium.org> > > > Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> > > > Reviewed-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> > > > > > @@ -0,0 +1,65 @@ > > > +.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections > > > > It's nice that you try to use SPDX identifiers, but this is absolutely not > > how it works. > > > > We went great length to document how SPDX identifiers are to be used and > > checkpatch emits a warning on this patch as well. > > > > WARNING: 'SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections' is not supported in LICENSES/... > > > > It's well documented that the license text including metadata needs to be > > available in LICENSES. > > > > What you are doing here is just counterproductive. The SPDX work is done to > > help automated license compliance. But the SPDX id above is broken and will > > let tools fail. > > > > Even if we add the GFDL1.1 to LICENSES, it's still broken because there is > > no such exception 'no-invariant-section' and no, we are not going to create > > it just in the kernel without having sorted that with the SPDX folks first. > > I know, and, after talking with Kate about that, I actually opened a SPDX > issue in Aug, 30: > > https://github.com/spdx/license-list-XML/issues/686 > > Btw, this is just the tip of the iceberg: I have another patchset pending > adding the GFDL license to LICENSES and doing some changes that are > required for Debian to be able to package the Kernel documentation: > > https://git.linuxtv.org/mchehab/experimental.git/log/?h=doc_license > > It starts with Ben's patch: > "Documentation/media: uapi: Explicitly say there are no Invariant Sections" > > And tag media docs with SPDX headers. > > > Mauro, you wrote yourself in a reply to this patch: > > > > > Mental note: we'll need to push the no-invariant-sections upstream > > > before merging this there. > > > > and then you went and applied it nevertheless without talking to anyone who > > is involved with that SPDX effort of cleaning up the kernels licensing mess. > > Sorry, I ended by sleeping on this. This specific patch was on a separate > topic branch. I completely forgot that this was waiting for SPDX committee > feedback about how to use GFDL. > > > I'm grumpy about that particularly because you are the first person who > > complains about legal implications which might affect you. > > > > But then you go and just ignore process and legal implications and push the > > crap into mainline. > > > > Please get this sorted ASAP. > > It would be great to have an ETA from SPDX about how long they'll > take to solve this issue. It has been about 2,5 months without > any concrete way about how we should address it. > > I really don't want to add new documents at the media uAPI stuff > (with is GFDL due to historical reasons) without make them also > GPL. On the other hand, freezing API submissions to the media > subsystem just due to the lack of proper SPDX support for GFDL > seems plain wrong. > > Perhaps one workaround would be to explicitly not using the > SPDX-License-Identifier, adding a longer licensing text that could > later be replaced by a SPDX license (if they ever figure out how > GFDL without invariants sections should be used). Something like: > > > .. SPDX License for this file: GPL-2.0 OR GFDL-1.1-or-later > .. > .. For GPL-2.0, see LICENSES/preferred/GPL-2.0 > .. > .. For GFDL-1.1-or-later, see: > .. > .. 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. > > Will that work for you? > > If so, the patch solving the current issue is enclosed. > > I'll rebase my other SPDX patchset to use the same solution after > we have an agreement on this. > > Thanks, > Mauro > > media: mediactl docs: don't use SPDX for GFDL > > There is an open issue for using GFDL without invariant sections: > > https://github.com/spdx/license-list-XML/issues/686 > > So far, no progress. > > While we don't have it, we can't really use SPDX identifiers on media. > So, replace them by a license text. > > Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> > > diff --git a/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst b/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst > index 0f8b31874002..60874a1f3d89 100644 > --- a/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst > +++ b/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst > @@ -1,4 +1,15 @@ > -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections > +.. SPDX License for this file: GPL-2.0 OR GFDL-1.1-or-later > +.. > +.. For GPL-2.0, see LICENSES/preferred/GPL-2.0 > +.. > +.. For GFDL-1.1-or-later, see: > +.. > +.. 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. > > .. _media_ioc_request_alloc: > > diff --git a/Documentation/media/uapi/mediactl/media-request-ioc-queue.rst b/Documentation/media/uapi/mediactl/media-request-ioc-queue.rst > index 6dd2d7fea714..3f481256f75a 100644 > --- a/Documentation/media/uapi/mediactl/media-request-ioc-queue.rst > +++ b/Documentation/media/uapi/mediactl/media-request-ioc-queue.rst > @@ -1,4 +1,15 @@ > -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections > +.. SPDX License for this file: GPL-2.0 OR GFDL-1.1-or-later > +.. > +.. For GPL-2.0, see LICENSES/preferred/GPL-2.0 > +.. > +.. For GFDL-1.1-or-later, see: > +.. > +.. 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. > > .. _media_request_ioc_queue: > > diff --git a/Documentation/media/uapi/mediactl/media-request-ioc-reinit.rst b/Documentation/media/uapi/mediactl/media-request-ioc-reinit.rst > index febe888494c8..d9c4d308b477 100644 > --- a/Documentation/media/uapi/mediactl/media-request-ioc-reinit.rst > +++ b/Documentation/media/uapi/mediactl/media-request-ioc-reinit.rst > @@ -1,4 +1,15 @@ > -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections > +.. SPDX License for this file: GPL-2.0 OR GFDL-1.1-or-later > +.. > +.. For GPL-2.0, see LICENSES/preferred/GPL-2.0 > +.. > +.. For GFDL-1.1-or-later, see: > +.. > +.. 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. > > .. _media_request_ioc_reinit: > > diff --git a/Documentation/media/uapi/mediactl/request-api.rst b/Documentation/media/uapi/mediactl/request-api.rst > index 5f4a23029c48..7a85b346db91 100644 > --- a/Documentation/media/uapi/mediactl/request-api.rst > +++ b/Documentation/media/uapi/mediactl/request-api.rst > @@ -1,4 +1,15 @@ > -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections > +.. SPDX License for this file: GPL-2.0 OR GFDL-1.1-or-later > +.. > +.. For GPL-2.0, see LICENSES/preferred/GPL-2.0 > +.. > +.. For GFDL-1.1-or-later, see: > +.. > +.. 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. > > .. _media-request-api: > > diff --git a/Documentation/media/uapi/mediactl/request-func-close.rst b/Documentation/media/uapi/mediactl/request-func-close.rst > index 098d7f2b9548..c85275a8870c 100644 > --- a/Documentation/media/uapi/mediactl/request-func-close.rst > +++ b/Documentation/media/uapi/mediactl/request-func-close.rst > @@ -1,4 +1,15 @@ > -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections > +.. SPDX License for this file: GPL-2.0 OR GFDL-1.1-or-later > +.. > +.. For GPL-2.0, see LICENSES/preferred/GPL-2.0 > +.. > +.. For GFDL-1.1-or-later, see: > +.. > +.. 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. > > .. _request-func-close: > > diff --git a/Documentation/media/uapi/mediactl/request-func-ioctl.rst b/Documentation/media/uapi/mediactl/request-func-ioctl.rst > index ff7b072a6999..8b69465bd2dd 100644 > --- a/Documentation/media/uapi/mediactl/request-func-ioctl.rst > +++ b/Documentation/media/uapi/mediactl/request-func-ioctl.rst > @@ -1,4 +1,15 @@ > -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections > +.. SPDX License for this file: GPL-2.0 OR GFDL-1.1-or-later > +.. > +.. For GPL-2.0, see LICENSES/preferred/GPL-2.0 > +.. > +.. For GFDL-1.1-or-later, see: > +.. > +.. 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. > > .. _request-func-ioctl: > > diff --git a/Documentation/media/uapi/mediactl/request-func-poll.rst b/Documentation/media/uapi/mediactl/request-func-poll.rst > index 85191254f381..8f58f9948cb6 100644 > --- a/Documentation/media/uapi/mediactl/request-func-poll.rst > +++ b/Documentation/media/uapi/mediactl/request-func-poll.rst > @@ -1,4 +1,15 @@ > -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections > +.. SPDX License for this file: GPL-2.0 OR GFDL-1.1-or-later > +.. > +.. For GPL-2.0, see LICENSES/preferred/GPL-2.0 > +.. > +.. For GFDL-1.1-or-later, see: > +.. > +.. 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. > > .. _request-func-poll: > > Thanks, Mauro ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCHv18 01/35] Documentation: v4l: document request API 2018-11-23 9:51 ` Mauro Carvalho Chehab @ 2018-11-23 10:38 ` Thomas Gleixner 2018-11-23 12:29 ` Mauro Carvalho Chehab 0 siblings, 1 reply; 8+ messages in thread From: Thomas Gleixner @ 2018-11-23 10:38 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: linux-media, LKML, Alexandre Courbot, Hans Verkuil, Hans Verkuil, Greg KH, Kate Stewart, Linus Torvalds, Ben Hutchings Mauro, On Fri, 23 Nov 2018, Mauro Carvalho Chehab wrote: > > While we don't have it, we can't really use SPDX identifiers on media. > > So, replace them by a license text. > > > > Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> > > > > diff --git a/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst b/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst > > index 0f8b31874002..60874a1f3d89 100644 > > --- a/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst > > +++ b/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst > > @@ -1,4 +1,15 @@ > > -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections > > +.. SPDX License for this file: GPL-2.0 OR GFDL-1.1-or-later > > +.. > > +.. For GPL-2.0, see LICENSES/preferred/GPL-2.0 > > +.. > > +.. For GFDL-1.1-or-later, see: > > +.. > > +.. 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. There is still an issue here. The SPDX id for GFDL requires the license text to be in LICENSES/.... But the plain GFDL-1.1-or-later lacks the invariant/front/back parts which are an exception to the license and require an exception ID along with the corresponding file in LICENSES/..... again. So no, this won't cut it. Please stay with free form license information until this is resolved. Kate, can you have a look into that please on the SPDX side? Thanks, tglx ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCHv18 01/35] Documentation: v4l: document request API 2018-11-23 10:38 ` Thomas Gleixner @ 2018-11-23 12:29 ` Mauro Carvalho Chehab 2018-11-23 12:44 ` Thomas Gleixner 2018-11-26 3:27 ` Tomasz Figa 0 siblings, 2 replies; 8+ messages in thread From: Mauro Carvalho Chehab @ 2018-11-23 12:29 UTC (permalink / raw) To: Thomas Gleixner Cc: linux-media, LKML, Alexandre Courbot, Hans Verkuil, Hans Verkuil, Greg KH, Kate Stewart, Linus Torvalds, Ben Hutchings Em Fri, 23 Nov 2018 11:38:37 +0100 (CET) Thomas Gleixner <tglx@linutronix.de> escreveu: > Mauro, > > On Fri, 23 Nov 2018, Mauro Carvalho Chehab wrote: > > > While we don't have it, we can't really use SPDX identifiers on media. > > > So, replace them by a license text. > > > > > > Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> > > > > > > diff --git a/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst b/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst > > > index 0f8b31874002..60874a1f3d89 100644 > > > --- a/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst > > > +++ b/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst > > > @@ -1,4 +1,15 @@ > > > -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections > > > +.. SPDX License for this file: GPL-2.0 OR GFDL-1.1-or-later > > > +.. > > > +.. For GPL-2.0, see LICENSES/preferred/GPL-2.0 > > > +.. > > > +.. For GFDL-1.1-or-later, see: > > > +.. > > > +.. 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. > > There is still an issue here. > > The SPDX id for GFDL requires the license text to be in LICENSES/.... > > But the plain GFDL-1.1-or-later lacks the invariant/front/back parts which > are an exception to the license and require an exception ID along with the > corresponding file in LICENSES/..... again. > > So no, this won't cut it. Please stay with free form license information > until this is resolved. Ok, I'll use then the enclosed patch, replacing them by a free form license info, adding a TODO at the end, as a reminder. > Kate, can you have a look into that please on the SPDX side? Thanks, Mauro [PATCH] media: mediactl docs: Fix licensing message Right now, it mentions two SPDX headers that don't exist inside the Kernel: GFDL-1.1-or-later And an exception: no-invariant-sections While it would be trivial to add the first one, there's no way, currently, to distinguish, with SPDX, between a free and a non-free document under GFDL. Free documents with GFDL should not have invariant sections. There's an open issue at SPDX tree waiting for it to be solved. While we don't have this issue closed, let's just replace by a free-text license, and add a TODO note to remind us to revisit it later. Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> diff --git a/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst b/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst index 0f8b31874002..de131f00c249 100644 --- a/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst +++ b/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst @@ -1,4 +1,28 @@ -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections +.. This file is dual-licensed: you can use it either under the terms +.. of the GPL 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 as +.. published by the Free Software Foundation; either version 2 of +.. the License, or (at your option) any later version. +.. +.. 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 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 .. _media_ioc_request_alloc: diff --git a/Documentation/media/uapi/mediactl/media-request-ioc-queue.rst b/Documentation/media/uapi/mediactl/media-request-ioc-queue.rst index 6dd2d7fea714..5d2604345e19 100644 --- a/Documentation/media/uapi/mediactl/media-request-ioc-queue.rst +++ b/Documentation/media/uapi/mediactl/media-request-ioc-queue.rst @@ -1,4 +1,28 @@ -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections +.. This file is dual-licensed: you can use it either under the terms +.. of the GPL 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 as +.. published by the Free Software Foundation; either version 2 of +.. the License, or (at your option) any later version. +.. +.. 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 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 .. _media_request_ioc_queue: diff --git a/Documentation/media/uapi/mediactl/media-request-ioc-reinit.rst b/Documentation/media/uapi/mediactl/media-request-ioc-reinit.rst index febe888494c8..ec61960c81ce 100644 --- a/Documentation/media/uapi/mediactl/media-request-ioc-reinit.rst +++ b/Documentation/media/uapi/mediactl/media-request-ioc-reinit.rst @@ -1,4 +1,28 @@ -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections +.. This file is dual-licensed: you can use it either under the terms +.. of the GPL 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 as +.. published by the Free Software Foundation; either version 2 of +.. the License, or (at your option) any later version. +.. +.. 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 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 .. _media_request_ioc_reinit: diff --git a/Documentation/media/uapi/mediactl/request-api.rst b/Documentation/media/uapi/mediactl/request-api.rst index 5f4a23029c48..945113dcb218 100644 --- a/Documentation/media/uapi/mediactl/request-api.rst +++ b/Documentation/media/uapi/mediactl/request-api.rst @@ -1,4 +1,28 @@ -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections +.. This file is dual-licensed: you can use it either under the terms +.. of the GPL 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 as +.. published by the Free Software Foundation; either version 2 of +.. the License, or (at your option) any later version. +.. +.. 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 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 .. _media-request-api: diff --git a/Documentation/media/uapi/mediactl/request-func-close.rst b/Documentation/media/uapi/mediactl/request-func-close.rst index 098d7f2b9548..dcf3f35bcf17 100644 --- a/Documentation/media/uapi/mediactl/request-func-close.rst +++ b/Documentation/media/uapi/mediactl/request-func-close.rst @@ -1,4 +1,28 @@ -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections +.. This file is dual-licensed: you can use it either under the terms +.. of the GPL 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 as +.. published by the Free Software Foundation; either version 2 of +.. the License, or (at your option) any later version. +.. +.. 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 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 .. _request-func-close: diff --git a/Documentation/media/uapi/mediactl/request-func-ioctl.rst b/Documentation/media/uapi/mediactl/request-func-ioctl.rst index ff7b072a6999..11a22f887843 100644 --- a/Documentation/media/uapi/mediactl/request-func-ioctl.rst +++ b/Documentation/media/uapi/mediactl/request-func-ioctl.rst @@ -1,4 +1,28 @@ -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections +.. This file is dual-licensed: you can use it either under the terms +.. of the GPL 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 as +.. published by the Free Software Foundation; either version 2 of +.. the License, or (at your option) any later version. +.. +.. 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 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 .. _request-func-ioctl: diff --git a/Documentation/media/uapi/mediactl/request-func-poll.rst b/Documentation/media/uapi/mediactl/request-func-poll.rst index 85191254f381..2609fd54d519 100644 --- a/Documentation/media/uapi/mediactl/request-func-poll.rst +++ b/Documentation/media/uapi/mediactl/request-func-poll.rst @@ -1,4 +1,28 @@ -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections +.. This file is dual-licensed: you can use it either under the terms +.. of the GPL 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 as +.. published by the Free Software Foundation; either version 2 of +.. the License, or (at your option) any later version. +.. +.. 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 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 .. _request-func-poll: ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCHv18 01/35] Documentation: v4l: document request API 2018-11-23 12:29 ` Mauro Carvalho Chehab @ 2018-11-23 12:44 ` Thomas Gleixner 2018-11-27 18:54 ` Mauro Carvalho Chehab 2018-11-26 3:27 ` Tomasz Figa 1 sibling, 1 reply; 8+ messages in thread From: Thomas Gleixner @ 2018-11-23 12:44 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: linux-media, LKML, Alexandre Courbot, Hans Verkuil, Hans Verkuil, Greg KH, Kate Stewart, Linus Torvalds, Ben Hutchings On Fri, 23 Nov 2018, Mauro Carvalho Chehab wrote: > Ok, I'll use then the enclosed patch, replacing them by a free > form license info, adding a TODO at the end, as a reminder. LGTM. Thanks for fixing this. tglx ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCHv18 01/35] Documentation: v4l: document request API 2018-11-23 12:44 ` Thomas Gleixner @ 2018-11-27 18:54 ` Mauro Carvalho Chehab 0 siblings, 0 replies; 8+ messages in thread From: Mauro Carvalho Chehab @ 2018-11-27 18:54 UTC (permalink / raw) To: Thomas Gleixner Cc: linux-media, LKML, Alexandre Courbot, Hans Verkuil, Hans Verkuil, Greg KH, Kate Stewart, Linus Torvalds, Ben Hutchings Em Fri, 23 Nov 2018 13:44:24 +0100 (CET) Thomas Gleixner <tglx@linutronix.de> escreveu: > On Fri, 23 Nov 2018, Mauro Carvalho Chehab wrote: > > Ok, I'll use then the enclosed patch, replacing them by a free > > form license info, adding a TODO at the end, as a reminder. > > LGTM. Thanks for fixing this. Thanks for reviewing it. Added to my fixes branch. I'll push upstream later this week. Thanks, Mauro ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCHv18 01/35] Documentation: v4l: document request API 2018-11-23 12:29 ` Mauro Carvalho Chehab 2018-11-23 12:44 ` Thomas Gleixner @ 2018-11-26 3:27 ` Tomasz Figa 1 sibling, 0 replies; 8+ messages in thread From: Tomasz Figa @ 2018-11-26 3:27 UTC (permalink / raw) To: Mauro Carvalho Chehab Cc: Thomas Gleixner, Linux Media Mailing List, Linux Kernel Mailing List, Alexandre Courbot, Hans Verkuil, Hans Verkuil, Greg KH, kstewart, torvalds, ben On Fri, Nov 23, 2018 at 9:29 PM Mauro Carvalho Chehab <mchehab@kernel.org> wrote: > > Em Fri, 23 Nov 2018 11:38:37 +0100 (CET) > Thomas Gleixner <tglx@linutronix.de> escreveu: > > > Mauro, > > > > On Fri, 23 Nov 2018, Mauro Carvalho Chehab wrote: > > > > While we don't have it, we can't really use SPDX identifiers on media. > > > > So, replace them by a license text. > > > > > > > > Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> > > > > > > > > diff --git a/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst b/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst > > > > index 0f8b31874002..60874a1f3d89 100644 > > > > --- a/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst > > > > +++ b/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst > > > > @@ -1,4 +1,15 @@ > > > > -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections > > > > +.. SPDX License for this file: GPL-2.0 OR GFDL-1.1-or-later > > > > +.. > > > > +.. For GPL-2.0, see LICENSES/preferred/GPL-2.0 > > > > +.. > > > > +.. For GFDL-1.1-or-later, see: > > > > +.. > > > > +.. 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. > > > > There is still an issue here. > > > > The SPDX id for GFDL requires the license text to be in LICENSES/.... > > > > But the plain GFDL-1.1-or-later lacks the invariant/front/back parts which > > are an exception to the license and require an exception ID along with the > > corresponding file in LICENSES/..... again. > > > > So no, this won't cut it. Please stay with free form license information > > until this is resolved. > > Ok, I'll use then the enclosed patch, replacing them by a free > form license info, adding a TODO at the end, as a reminder. > > > Kate, can you have a look into that please on the SPDX side? > > Thanks, > Mauro > > [PATCH] media: mediactl docs: Fix licensing message > > Right now, it mentions two SPDX headers that don't exist inside the Kernel: > GFDL-1.1-or-later > And an exception: > no-invariant-sections > > While it would be trivial to add the first one, there's no way, > currently, to distinguish, with SPDX, between a free and a non-free > document under GFDL. > > Free documents with GFDL should not have invariant sections. > > There's an open issue at SPDX tree waiting for it to be solved. > While we don't have this issue closed, let's just replace by a > free-text license, and add a TODO note to remind us to revisit it > later. > > Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> > > diff --git a/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst b/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst > index 0f8b31874002..de131f00c249 100644 > --- a/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst > +++ b/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst > @@ -1,4 +1,28 @@ > -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections > +.. This file is dual-licensed: you can use it either under the terms > +.. of the GPL 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 as > +.. published by the Free Software Foundation; either version 2 of > +.. the License, or (at your option) any later version. > +.. > +.. 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 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 > > .. _media_ioc_request_alloc: > > diff --git a/Documentation/media/uapi/mediactl/media-request-ioc-queue.rst b/Documentation/media/uapi/mediactl/media-request-ioc-queue.rst > index 6dd2d7fea714..5d2604345e19 100644 > --- a/Documentation/media/uapi/mediactl/media-request-ioc-queue.rst > +++ b/Documentation/media/uapi/mediactl/media-request-ioc-queue.rst > @@ -1,4 +1,28 @@ > -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections > +.. This file is dual-licensed: you can use it either under the terms > +.. of the GPL 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 as > +.. published by the Free Software Foundation; either version 2 of > +.. the License, or (at your option) any later version. > +.. > +.. 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 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 > > .. _media_request_ioc_queue: > > diff --git a/Documentation/media/uapi/mediactl/media-request-ioc-reinit.rst b/Documentation/media/uapi/mediactl/media-request-ioc-reinit.rst > index febe888494c8..ec61960c81ce 100644 > --- a/Documentation/media/uapi/mediactl/media-request-ioc-reinit.rst > +++ b/Documentation/media/uapi/mediactl/media-request-ioc-reinit.rst > @@ -1,4 +1,28 @@ > -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections > +.. This file is dual-licensed: you can use it either under the terms > +.. of the GPL 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 as > +.. published by the Free Software Foundation; either version 2 of > +.. the License, or (at your option) any later version. > +.. > +.. 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 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 > > .. _media_request_ioc_reinit: > > diff --git a/Documentation/media/uapi/mediactl/request-api.rst b/Documentation/media/uapi/mediactl/request-api.rst > index 5f4a23029c48..945113dcb218 100644 > --- a/Documentation/media/uapi/mediactl/request-api.rst > +++ b/Documentation/media/uapi/mediactl/request-api.rst > @@ -1,4 +1,28 @@ > -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections > +.. This file is dual-licensed: you can use it either under the terms > +.. of the GPL 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 as > +.. published by the Free Software Foundation; either version 2 of > +.. the License, or (at your option) any later version. > +.. > +.. 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 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 > > .. _media-request-api: > > diff --git a/Documentation/media/uapi/mediactl/request-func-close.rst b/Documentation/media/uapi/mediactl/request-func-close.rst > index 098d7f2b9548..dcf3f35bcf17 100644 > --- a/Documentation/media/uapi/mediactl/request-func-close.rst > +++ b/Documentation/media/uapi/mediactl/request-func-close.rst > @@ -1,4 +1,28 @@ > -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections > +.. This file is dual-licensed: you can use it either under the terms > +.. of the GPL 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 as > +.. published by the Free Software Foundation; either version 2 of > +.. the License, or (at your option) any later version. > +.. > +.. 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 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 > > .. _request-func-close: > > diff --git a/Documentation/media/uapi/mediactl/request-func-ioctl.rst b/Documentation/media/uapi/mediactl/request-func-ioctl.rst > index ff7b072a6999..11a22f887843 100644 > --- a/Documentation/media/uapi/mediactl/request-func-ioctl.rst > +++ b/Documentation/media/uapi/mediactl/request-func-ioctl.rst > @@ -1,4 +1,28 @@ > -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections > +.. This file is dual-licensed: you can use it either under the terms > +.. of the GPL 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 as > +.. published by the Free Software Foundation; either version 2 of > +.. the License, or (at your option) any later version. > +.. > +.. 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 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 > > .. _request-func-ioctl: > > diff --git a/Documentation/media/uapi/mediactl/request-func-poll.rst b/Documentation/media/uapi/mediactl/request-func-poll.rst > index 85191254f381..2609fd54d519 100644 > --- a/Documentation/media/uapi/mediactl/request-func-poll.rst > +++ b/Documentation/media/uapi/mediactl/request-func-poll.rst > @@ -1,4 +1,28 @@ > -.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections > +.. This file is dual-licensed: you can use it either under the terms > +.. of the GPL 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 as > +.. published by the Free Software Foundation; either version 2 of > +.. the License, or (at your option) any later version. > +.. > +.. 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 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 > > .. _request-func-poll: > > > Verified with a grep over Documentation/media that this patch replaces all the instances of "GFDL-1.1-or-later WITH" and so: Reviewed-by: Tomasz Figa <tfiga@chromium.org> Best regards, Tomasz ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2018-11-27 18:54 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20180814142047.93856-1-hverkuil@xs4all.nl>
[not found] ` <20180814142047.93856-2-hverkuil@xs4all.nl>
2018-11-12 19:06 ` [PATCHv18 01/35] Documentation: v4l: document request API Thomas Gleixner
2018-11-18 13:52 ` Mauro Carvalho Chehab
2018-11-23 9:51 ` Mauro Carvalho Chehab
2018-11-23 10:38 ` Thomas Gleixner
2018-11-23 12:29 ` Mauro Carvalho Chehab
2018-11-23 12:44 ` Thomas Gleixner
2018-11-27 18:54 ` Mauro Carvalho Chehab
2018-11-26 3:27 ` Tomasz Figa
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox