media: docs: fix some GPL licensing ambiguity at the text

Those files are meant to be dual GPL 2.0 and GFDL without
implicit sections. However, by a wrong cut-and-paste, I ended
by applying a GPL 2+ license text to it, while still using the
GPL 2.0 SPDX tag, with would cause an ambiguity about the
licensing model.

Solve this by explicitly mentioning that the dual licensing
is between GPL 2.0 and GFDL and correcting the text.

Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

diff --git a/Documentation/media/uapi/dvb/dvbstb.svg b/Documentation/media/uapi/dvb/dvbstb.svg
index 9700c864d3c377305e68dc848ac128522aebc605..c7672148d6ffa883f52235b41314920606039310 100644 (file)
--- a/Documentation/media/uapi/dvb/dvbstb.svg
+++ b/Documentation/media/uapi/dvb/dvbstb.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     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
+    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; either version 2 of
-       the License, or (at your option) any later version.
+       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

diff --git a/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst b/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst
index de131f00c24966e29dde6e61b489cafef39c9b9e..6d4ca4ada2e0c5caaa0231b671d592b943a17a5c 100644 (file)
--- a/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst
+++ b/Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst
@@ -1,12 +1,12 @@
 .. 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
+.. 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; either version 2 of
-..    the License, or (at your option) any later version.
+..    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

diff --git a/Documentation/media/uapi/mediactl/media-request-ioc-queue.rst b/Documentation/media/uapi/mediactl/media-request-ioc-queue.rst
index 5d2604345e191c9a34fe63d3b57a2ed719e57fa0..fc8458746d51b5748ed2b1e44ca1e8a72463b95f 100644 (file)
--- a/Documentation/media/uapi/mediactl/media-request-ioc-queue.rst
+++ b/Documentation/media/uapi/mediactl/media-request-ioc-queue.rst
@@ -1,12 +1,12 @@
 .. 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
+.. 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; either version 2 of
-..    the License, or (at your option) any later version.
+..    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

diff --git a/Documentation/media/uapi/mediactl/media-request-ioc-reinit.rst b/Documentation/media/uapi/mediactl/media-request-ioc-reinit.rst
index ec61960c81ce9b4eb47381eef9b5dfb57df1e7fb..61381e87665aa4af5451ba9ffe7dcc2a45bb3450 100644 (file)
--- a/Documentation/media/uapi/mediactl/media-request-ioc-reinit.rst
+++ b/Documentation/media/uapi/mediactl/media-request-ioc-reinit.rst
@@ -1,12 +1,12 @@
 .. 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
+.. 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; either version 2 of
-..    the License, or (at your option) any later version.
+..    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

diff --git a/Documentation/media/uapi/mediactl/request-api.rst b/Documentation/media/uapi/mediactl/request-api.rst
index 945113dcb2185762e4d74d20712868755dbee0ca..4b25ad03f45aea8364d8e36d6dda33e5f677438a 100644 (file)
--- a/Documentation/media/uapi/mediactl/request-api.rst
+++ b/Documentation/media/uapi/mediactl/request-api.rst
@@ -1,12 +1,12 @@
 .. 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
+.. 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; either version 2 of
-..    the License, or (at your option) any later version.
+..    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

diff --git a/Documentation/media/uapi/mediactl/request-func-close.rst b/Documentation/media/uapi/mediactl/request-func-close.rst
index dcf3f35bcf176d8a0d1a33e3b0d4a42c8832c72a..2cff7770558e1e3fd1c99b98ddfd518e9a1af85b 100644 (file)
--- a/Documentation/media/uapi/mediactl/request-func-close.rst
+++ b/Documentation/media/uapi/mediactl/request-func-close.rst
@@ -1,12 +1,12 @@
 .. 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
+.. 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; either version 2 of
-..    the License, or (at your option) any later version.
+..    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

diff --git a/Documentation/media/uapi/mediactl/request-func-ioctl.rst b/Documentation/media/uapi/mediactl/request-func-ioctl.rst
index 11a22f8878439cb1fbae0837879b7e1b3c64d5da..de0781c618730944a8fa6d3fc22ae3ff48a724fe 100644 (file)
--- a/Documentation/media/uapi/mediactl/request-func-ioctl.rst
+++ b/Documentation/media/uapi/mediactl/request-func-ioctl.rst
@@ -1,12 +1,12 @@
 .. 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
+.. 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; either version 2 of
-..    the License, or (at your option) any later version.
+..    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

diff --git a/Documentation/media/uapi/mediactl/request-func-poll.rst b/Documentation/media/uapi/mediactl/request-func-poll.rst
index 2609fd54d519cb2379f6ec19033ea87ac7c3469d..ebaf33e218738d44c7df6759e715b075f59ed363 100644 (file)
--- a/Documentation/media/uapi/mediactl/request-func-poll.rst
+++ b/Documentation/media/uapi/mediactl/request-func-poll.rst
@@ -1,12 +1,12 @@
 .. 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
+.. 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; either version 2 of
-..    the License, or (at your option) any later version.
+..    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

diff --git a/Documentation/media/uapi/v4l/bayer.svg b/Documentation/media/uapi/v4l/bayer.svg
index abec45b7873bb1ae95d01915352a181366bd5b2d..c5bf85103901f7716221c61d8a9ee1f0bb678c1f 100644 (file)
--- a/Documentation/media/uapi/v4l/bayer.svg
+++ b/Documentation/media/uapi/v4l/bayer.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     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
+    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; either version 2 of
-       the License, or (at your option) any later version.
+       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

diff --git a/Documentation/media/uapi/v4l/constraints.svg b/Documentation/media/uapi/v4l/constraints.svg
index 18e314c60757d15d69137b583a542eeaecf81fa5..08f9f8b0985eb10c137d76240af71ec67689be43 100644 (file)
--- a/Documentation/media/uapi/v4l/constraints.svg
+++ b/Documentation/media/uapi/v4l/constraints.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     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
+    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; either version 2 of
-       the License, or (at your option) any later version.
+       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

diff --git a/Documentation/media/uapi/v4l/nv12mt.svg b/Documentation/media/uapi/v4l/nv12mt.svg
index 54ae99d64342b468abc6251476169f39f3241e3e..067d8fb34ba27d03cfbb0a0c18895d4e28a7d4ff 100644 (file)
--- a/Documentation/media/uapi/v4l/nv12mt.svg
+++ b/Documentation/media/uapi/v4l/nv12mt.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
     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
+    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; either version 2 of
-       the License, or (at your option) any later version.
+       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

diff --git a/Documentation/media/uapi/v4l/nv12mt_example.svg b/Documentation/media/uapi/v4l/nv12mt_example.svg
index 5eb8bcacc56cdcad7542e46ffdc675dcae08e9d6..70c3200fdb3288f4bfb7b0e4b84bdc1e3dfec1f5 100644 (file)
--- a/Documentation/media/uapi/v4l/nv12mt_example.svg
+++ b/Documentation/media/uapi/v4l/nv12mt_example.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
     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
+    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; either version 2 of
-       the License, or (at your option) any later version.
+       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

diff --git a/Documentation/media/uapi/v4l/selection.svg b/Documentation/media/uapi/v4l/selection.svg
index eeb195744e6043e104812b226c5bfc58133f719a..59d2bec9b27809de21e14d3be13b5d4f08973018 100644 (file)
--- a/Documentation/media/uapi/v4l/selection.svg
+++ b/Documentation/media/uapi/v4l/selection.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     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
+    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; either version 2 of
-       the License, or (at your option) any later version.
+       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