linux-kernel - Re: [PATCH] media: dev-encoder.rst: add GFDL-1-1+ to SPDX header

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <c014bee7-09ae-6061-55c1-df59be56761f@xs4all.nl>
Date:   Tue, 23 Jun 2020 14:57:13 +0200
From:   Hans Verkuil <hverkuil-cisco@...all.nl>
To:     Mauro Carvalho Chehab <mchehab+huawei@...nel.org>,
        Linux Media Mailing List <linux-media@...r.kernel.org>
Cc:     Tomasz Figa <tfiga@...omium.org>,
        Michael Tretter <m.tretter@...gutronix.de>,
        linux-kernel@...r.kernel.org
Subject: Re: [PATCH] media: dev-encoder.rst: add GFDL-1-1+ to SPDX header

On 23/06/2020 14:28, Mauro Carvalho Chehab wrote:
> The media documents under the uAPI should be GFDL compatible.
> 
> So, make this one dual-licensed GPL-2.0 or GFDL-1.1+ with
> no-invariant sections.
> 
> Signed-off-by: Tomasz Figa <tfiga@...omium.org>
> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@...nel.org>

Signed-off-by: Hans Verkuil <hverkuil-cisco@...all.nl>

Thanks!

	Hans

> ---
>  .../userspace-api/media/v4l/dev-encoder.rst   | 26 ++++++++++++++++++-
>  1 file changed, 25 insertions(+), 1 deletion(-)
> 
> diff --git a/Documentation/userspace-api/media/v4l/dev-encoder.rst b/Documentation/userspace-api/media/v4l/dev-encoder.rst
> index c3a21bfe0052..fb44f20924de 100644
> --- a/Documentation/userspace-api/media/v4l/dev-encoder.rst
> +++ b/Documentation/userspace-api/media/v4l/dev-encoder.rst
> @@ -1,4 +1,28 @@
> -.. SPDX-License-Identifier: GPL-2.0
> +.. 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 as
> +..    published by the Free Software Foundation version 2 of
> +..    the License.
> +..
> +..    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/userspace-api/media/fdl-appendix.rst.
> +..
> +.. TODO: replace it to GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections
>  
>  .. _encoder:
>  
>