* [PATCH 02/26] ARM: sunxi: regulators: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording Maxime Ripard
@ 2014-10-17 9:38 ` Maxime Ripard
2014-10-18 10:21 ` Hans de Goede
2014-10-21 17:16 ` Maxime Ripard
2014-10-17 9:38 ` [PATCH 03/26] ARM: sun4i: a1000: " Maxime Ripard
` (26 subsequent siblings)
27 siblings, 2 replies; 67+ messages in thread
From: Maxime Ripard @ 2014-10-17 9:38 UTC (permalink / raw)
To: linux-arm-kernel
The current GPL only licensing on the DTSI makes it very impractical for other
software components licensed under another license.
In order to make it easier for them to reuse our device trees, relicense our
device trees under a GPL/X11 dual-license.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: Hans de Goede <hdegoede@redhat.com>
---
arch/arm/boot/dts/sunxi-common-regulators.dtsi | 46 +++++++++++++++++++++++---
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/sunxi-common-regulators.dtsi b/arch/arm/boot/dts/sunxi-common-regulators.dtsi
index c9c5b10e03eb..fa69adfea7fc 100644
--- a/arch/arm/boot/dts/sunxi-common-regulators.dtsi
+++ b/arch/arm/boot/dts/sunxi-common-regulators.dtsi
@@ -3,12 +3,48 @@
*
* Copyright 2014 - Hans de Goede <hdegoede@redhat.com>
*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
*
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
*/
/ {
--
2.1.1
^ permalink raw reply related [flat|nested] 67+ messages in thread* [PATCH 02/26] ARM: sunxi: regulators: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 ` [PATCH 02/26] ARM: sunxi: regulators: Relicense the device tree under GPLv2/X11 Maxime Ripard
@ 2014-10-18 10:21 ` Hans de Goede
2014-10-21 17:16 ` Maxime Ripard
1 sibling, 0 replies; 67+ messages in thread
From: Hans de Goede @ 2014-10-18 10:21 UTC (permalink / raw)
To: linux-arm-kernel
Hi Maxime,
I somehow did not get the coverletter for this, so I'm replying to this
patch instead.
This patch, and all the other dts relicense patches in this series are:
Acked-by: Hans de Goede <hdegoede@redhat.com>
Regards,
Hans
On 10/17/2014 11:38 AM, Maxime Ripard wrote:
> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
>
> In order to make it easier for them to reuse our device trees, relicense our
> device trees under a GPL/X11 dual-license.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Chen-Yu Tsai <wens@csie.org>
> Cc: Hans de Goede <hdegoede@redhat.com>
> ---
> arch/arm/boot/dts/sunxi-common-regulators.dtsi | 46 +++++++++++++++++++++++---
> 1 file changed, 41 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/boot/dts/sunxi-common-regulators.dtsi b/arch/arm/boot/dts/sunxi-common-regulators.dtsi
> index c9c5b10e03eb..fa69adfea7fc 100644
> --- a/arch/arm/boot/dts/sunxi-common-regulators.dtsi
> +++ b/arch/arm/boot/dts/sunxi-common-regulators.dtsi
> @@ -3,12 +3,48 @@
> *
> * Copyright 2014 - Hans de Goede <hdegoede@redhat.com>
> *
> - * The code contained herein is licensed under the GNU General Public
> - * License. You may obtain a copy of the GNU General Public License
> - * Version 2 or later at the following locations:
> + * This file is dual-licensed: you can use it either under the terms
> + * of the GPL or the X11 license, at your option. Note that this dual
> + * licensing only applies to this file, and not this project as a
> + * whole.
> *
> - * http://www.opensource.org/licenses/gpl-license.html
> - * http://www.gnu.org/copyleft/gpl.html
> + * 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.
> + *
> + * You should have received a copy of the GNU General Public
> + * License along with this file; if not, write to the Free
> + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
> + * MA 02110-1301 USA
> + *
> + * Or, alternatively,
> + *
> + * b) Permission is hereby granted, free of charge, to any person
> + * obtaining a copy of this software and associated documentation
> + * files (the "Software"), to deal in the Software without
> + * restriction, including without limitation the rights to use,
> + * copy, modify, merge, publish, distribute, sublicense, and/or
> + * sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following
> + * conditions:
> + *
> + * The above copyright notice and this permission notice shall be
> + * included in all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
> + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
> + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> */
>
> / {
>
^ permalink raw reply [flat|nested] 67+ messages in thread* [PATCH 02/26] ARM: sunxi: regulators: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 ` [PATCH 02/26] ARM: sunxi: regulators: Relicense the device tree under GPLv2/X11 Maxime Ripard
2014-10-18 10:21 ` Hans de Goede
@ 2014-10-21 17:16 ` Maxime Ripard
1 sibling, 0 replies; 67+ messages in thread
From: Maxime Ripard @ 2014-10-21 17:16 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Oct 17, 2014 at 11:38:24AM +0200, Maxime Ripard wrote:
> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
>
> In order to make it easier for them to reuse our device trees, relicense our
> device trees under a GPL/X11 dual-license.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Chen-Yu Tsai <wens@csie.org>
> Cc: Hans de Goede <hdegoede@redhat.com>
Applied with Chen-Yu and Hans' Acked-by
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141021/e372c82a/attachment.sig>
^ permalink raw reply [flat|nested] 67+ messages in thread
* [PATCH 03/26] ARM: sun4i: a1000: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording Maxime Ripard
2014-10-17 9:38 ` [PATCH 02/26] ARM: sunxi: regulators: Relicense the device tree under GPLv2/X11 Maxime Ripard
@ 2014-10-17 9:38 ` Maxime Ripard
2014-10-20 13:04 ` Olliver Schinagl
2014-10-28 14:48 ` Maxime Ripard
2014-10-17 9:38 ` [PATCH 04/26] ARM: sun4i: ba10: " Maxime Ripard
` (25 subsequent siblings)
27 siblings, 2 replies; 67+ messages in thread
From: Maxime Ripard @ 2014-10-17 9:38 UTC (permalink / raw)
To: linux-arm-kernel
The current GPL only licensing on the DTSI makes it very impractical for other
software components licensed under another license.
In order to make it easier for them to reuse our device trees, relicense our
device trees under a GPL/X11 dual-license.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Carlo Caione <carlo@caione.org>
Acked-by: Emilio L?pez <emilio@elopez.com.ar>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Oliver Schinagl <oliver@schinagl.nl>
Cc: Roman Byshko <rbyshko@gmail.com>
---
arch/arm/boot/dts/sun4i-a10-a1000.dts | 46 +++++++++++++++++++++++++++++++----
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/sun4i-a10-a1000.dts b/arch/arm/boot/dts/sun4i-a10-a1000.dts
index 9e99ade35e37..3bcfd81837f0 100644
--- a/arch/arm/boot/dts/sun4i-a10-a1000.dts
+++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts
@@ -3,12 +3,48 @@
*
* Emilio L?pez <emilio@elopez.com.ar>
*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
*
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
--
2.1.1
^ permalink raw reply related [flat|nested] 67+ messages in thread* [PATCH 03/26] ARM: sun4i: a1000: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 ` [PATCH 03/26] ARM: sun4i: a1000: " Maxime Ripard
@ 2014-10-20 13:04 ` Olliver Schinagl
2014-10-28 14:48 ` Maxime Ripard
1 sibling, 0 replies; 67+ messages in thread
From: Olliver Schinagl @ 2014-10-20 13:04 UTC (permalink / raw)
To: linux-arm-kernel
Hey Maxime,
Acked-by: Olliver Schinagl <oliver@schinagl.nl>
For the whole dts licensing series.
Also herby I grant permission to allow further dtsi submissions made by
me to be dual-licensed by you.
Olliver
On 17-10-14 11:38, Maxime Ripard wrote:
> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
>
> In order to make it easier for them to reuse our device trees, relicense our
> device trees under a GPL/X11 dual-license.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Carlo Caione <carlo@caione.org>
> Acked-by: Emilio L?pez <emilio@elopez.com.ar>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Cc: Oliver Schinagl <oliver@schinagl.nl>
> Cc: Roman Byshko <rbyshko@gmail.com>
> ---
> arch/arm/boot/dts/sun4i-a10-a1000.dts | 46 +++++++++++++++++++++++++++++++----
> 1 file changed, 41 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/boot/dts/sun4i-a10-a1000.dts b/arch/arm/boot/dts/sun4i-a10-a1000.dts
> index 9e99ade35e37..3bcfd81837f0 100644
> --- a/arch/arm/boot/dts/sun4i-a10-a1000.dts
> +++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts
> @@ -3,12 +3,48 @@
> *
> * Emilio L?pez <emilio@elopez.com.ar>
> *
> - * The code contained herein is licensed under the GNU General Public
> - * License. You may obtain a copy of the GNU General Public License
> - * Version 2 or later at the following locations:
> + * This file is dual-licensed: you can use it either under the terms
> + * of the GPL or the X11 license, at your option. Note that this dual
> + * licensing only applies to this file, and not this project as a
> + * whole.
> *
> - * http://www.opensource.org/licenses/gpl-license.html
> - * http://www.gnu.org/copyleft/gpl.html
> + * 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.
> + *
> + * You should have received a copy of the GNU General Public
> + * License along with this file; if not, write to the Free
> + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
> + * MA 02110-1301 USA
> + *
> + * Or, alternatively,
> + *
> + * b) Permission is hereby granted, free of charge, to any person
> + * obtaining a copy of this software and associated documentation
> + * files (the "Software"), to deal in the Software without
> + * restriction, including without limitation the rights to use,
> + * copy, modify, merge, publish, distribute, sublicense, and/or
> + * sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following
> + * conditions:
> + *
> + * The above copyright notice and this permission notice shall be
> + * included in all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
> + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
> + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> */
>
> /dts-v1/;
^ permalink raw reply [flat|nested] 67+ messages in thread
* [PATCH 03/26] ARM: sun4i: a1000: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 ` [PATCH 03/26] ARM: sun4i: a1000: " Maxime Ripard
2014-10-20 13:04 ` Olliver Schinagl
@ 2014-10-28 14:48 ` Maxime Ripard
1 sibling, 0 replies; 67+ messages in thread
From: Maxime Ripard @ 2014-10-28 14:48 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Oct 17, 2014 at 11:38:25AM +0200, Maxime Ripard wrote:
> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
>
> In order to make it easier for them to reuse our device trees, relicense our
> device trees under a GPL/X11 dual-license.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Carlo Caione <carlo@caione.org>
> Acked-by: Emilio L?pez <emilio@elopez.com.ar>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Cc: Oliver Schinagl <oliver@schinagl.nl>
> Cc: Roman Byshko <rbyshko@gmail.com>
Merged with Carlo, Hans, Oliver and Roman's Acked-by.
Thanks!
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141028/122602bd/attachment-0001.sig>
^ permalink raw reply [flat|nested] 67+ messages in thread
* [PATCH 04/26] ARM: sun4i: ba10: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording Maxime Ripard
2014-10-17 9:38 ` [PATCH 02/26] ARM: sunxi: regulators: Relicense the device tree under GPLv2/X11 Maxime Ripard
2014-10-17 9:38 ` [PATCH 03/26] ARM: sun4i: a1000: " Maxime Ripard
@ 2014-10-17 9:38 ` Maxime Ripard
2014-10-21 17:17 ` Maxime Ripard
2014-10-17 9:38 ` [PATCH 05/26] ARM: sun4i: cubieboard: " Maxime Ripard
` (24 subsequent siblings)
27 siblings, 1 reply; 67+ messages in thread
From: Maxime Ripard @ 2014-10-17 9:38 UTC (permalink / raw)
To: linux-arm-kernel
The current GPL only licensing on the DTSI makes it very impractical for other
software components licensed under another license.
In order to make it easier for them to reuse our device trees, relicense our
device trees under a GPL/X11 dual-license.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Hans de Goede <hdegoede@redhat.com>
---
arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 46 ++++++++++++++++++++++++++----
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts b/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts
index 1763cc7ec023..f3f2974658e4 100644
--- a/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts
+++ b/arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts
@@ -1,12 +1,48 @@
/*
* Copyright 2014 Hans de Goede <hdegoede@redhat.com>
*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
*
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
--
2.1.1
^ permalink raw reply related [flat|nested] 67+ messages in thread* [PATCH 05/26] ARM: sun4i: cubieboard: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording Maxime Ripard
` (2 preceding siblings ...)
2014-10-17 9:38 ` [PATCH 04/26] ARM: sun4i: ba10: " Maxime Ripard
@ 2014-10-17 9:38 ` Maxime Ripard
2014-10-17 9:44 ` Stefan Roese
2014-11-07 12:30 ` Maxime Ripard
2014-10-17 9:38 ` [PATCH 06/26] ARM: sun4i: hackberry: " Maxime Ripard
` (23 subsequent siblings)
27 siblings, 2 replies; 67+ messages in thread
From: Maxime Ripard @ 2014-10-17 9:38 UTC (permalink / raw)
To: linux-arm-kernel
The current GPL only licensing on the DTSI makes it very impractical for other
software components licensed under another license.
In order to make it easier for them to reuse our device trees, relicense our
device trees under a GPL/X11 dual-license.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Carlo Caione <carlo@caione.org>
Acked-by: Emilio L?pez <emilio@elopez.com.ar>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Oliver Schinagl <oliver@schinagl.nl>
Cc: Olof Johansson <olof@lixom.net>
Cc: Roman Byshko <rbyshko@gmail.com>
Cc: Stefan Roese <sr@denx.de>
---
arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 46 ++++++++++++++++++++++++++----
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
index 3ce56bfbc0b5..6a310da53f18 100644
--- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
+++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
@@ -2,12 +2,48 @@
* Copyright 2012 Stefan Roese
* Stefan Roese <sr@denx.de>
*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
*
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
--
2.1.1
^ permalink raw reply related [flat|nested] 67+ messages in thread* [PATCH 05/26] ARM: sun4i: cubieboard: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 ` [PATCH 05/26] ARM: sun4i: cubieboard: " Maxime Ripard
@ 2014-10-17 9:44 ` Stefan Roese
2014-11-07 12:30 ` Maxime Ripard
1 sibling, 0 replies; 67+ messages in thread
From: Stefan Roese @ 2014-10-17 9:44 UTC (permalink / raw)
To: linux-arm-kernel
On 17.10.2014 11:38, Maxime Ripard wrote:
> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
>
> In order to make it easier for them to reuse our device trees, relicense our
> device trees under a GPL/X11 dual-license.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Carlo Caione <carlo@caione.org>
> Acked-by: Emilio L?pez <emilio@elopez.com.ar>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Cc: Oliver Schinagl <oliver@schinagl.nl>
> Cc: Olof Johansson <olof@lixom.net>
> Cc: Roman Byshko <rbyshko@gmail.com>
> Cc: Stefan Roese <sr@denx.de>
Acked-by: Stefan Roese <sr@denx.de>
Thanks,
Stefan
^ permalink raw reply [flat|nested] 67+ messages in thread
* [PATCH 05/26] ARM: sun4i: cubieboard: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 ` [PATCH 05/26] ARM: sun4i: cubieboard: " Maxime Ripard
2014-10-17 9:44 ` Stefan Roese
@ 2014-11-07 12:30 ` Maxime Ripard
1 sibling, 0 replies; 67+ messages in thread
From: Maxime Ripard @ 2014-11-07 12:30 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Oct 17, 2014 at 11:38:27AM +0200, Maxime Ripard wrote:
> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
>
> In order to make it easier for them to reuse our device trees, relicense our
> device trees under a GPL/X11 dual-license.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Carlo Caione <carlo@caione.org>
> Acked-by: Emilio L?pez <emilio@elopez.com.ar>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Cc: Oliver Schinagl <oliver@schinagl.nl>
> Cc: Olof Johansson <olof@lixom.net>
> Cc: Roman Byshko <rbyshko@gmail.com>
> Cc: Stefan Roese <sr@denx.de>
Merged with the acked-by of everyone in Cc.
Thanks!
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141107/c9d6c835/attachment-0001.sig>
^ permalink raw reply [flat|nested] 67+ messages in thread
* [PATCH 06/26] ARM: sun4i: hackberry: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording Maxime Ripard
` (3 preceding siblings ...)
2014-10-17 9:38 ` [PATCH 05/26] ARM: sun4i: cubieboard: " Maxime Ripard
@ 2014-10-17 9:38 ` Maxime Ripard
2014-10-21 17:18 ` Maxime Ripard
2014-10-17 9:38 ` [PATCH 07/26] ARM: sun4i: inet97fv2: " Maxime Ripard
` (22 subsequent siblings)
27 siblings, 1 reply; 67+ messages in thread
From: Maxime Ripard @ 2014-10-17 9:38 UTC (permalink / raw)
To: linux-arm-kernel
The current GPL only licensing on the DTSI makes it very impractical for other
software components licensed under another license.
In order to make it easier for them to reuse our device trees, relicense our
device trees under a GPL/X11 dual-license.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Hans de Goede <hdegoede@redhat.com>
---
arch/arm/boot/dts/sun4i-a10-hackberry.dts | 46 +++++++++++++++++++++++++++----
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
index 891ea446abae..efc116287e0f 100644
--- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts
+++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
@@ -3,12 +3,48 @@
*
* Maxime Ripard <maxime.ripard@free-electrons.com>
*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
*
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
--
2.1.1
^ permalink raw reply related [flat|nested] 67+ messages in thread* [PATCH 07/26] ARM: sun4i: inet97fv2: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording Maxime Ripard
` (4 preceding siblings ...)
2014-10-17 9:38 ` [PATCH 06/26] ARM: sun4i: hackberry: " Maxime Ripard
@ 2014-10-17 9:38 ` Maxime Ripard
2014-10-21 17:19 ` Maxime Ripard
2014-10-17 9:38 ` [PATCH 08/26] ARM: sun4i: mini xplus: " Maxime Ripard
` (21 subsequent siblings)
27 siblings, 1 reply; 67+ messages in thread
From: Maxime Ripard @ 2014-10-17 9:38 UTC (permalink / raw)
To: linux-arm-kernel
The current GPL only licensing on the DTSI makes it very impractical for other
software components licensed under another license.
In order to make it easier for them to reuse our device trees, relicense our
device trees under a GPL/X11 dual-license.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Carlo Caione <carlo@caione.org>
Acked-by: David Lanzend??rfer <david.lanzendoerfer@o2s.ch>
Cc: Hans de Goede <hdegoede@redhat.com>
---
arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 46 +++++++++++++++++++++++++++----
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts b/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts
index 6b0c37812ade..3e25ee4d3248 100644
--- a/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts
+++ b/arch/arm/boot/dts/sun4i-a10-inet97fv2.dts
@@ -3,12 +3,48 @@
*
* David Lanzend?rfer <david.lanzendoerfer@o2s.ch>
*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
*
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
--
2.1.1
^ permalink raw reply related [flat|nested] 67+ messages in thread* [PATCH 08/26] ARM: sun4i: mini xplus: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording Maxime Ripard
` (5 preceding siblings ...)
2014-10-17 9:38 ` [PATCH 07/26] ARM: sun4i: inet97fv2: " Maxime Ripard
@ 2014-10-17 9:38 ` Maxime Ripard
2014-10-21 17:20 ` Maxime Ripard
2014-10-17 9:38 ` [PATCH 09/26] ARM: sun4i: olinuxino lime: " Maxime Ripard
` (20 subsequent siblings)
27 siblings, 1 reply; 67+ messages in thread
From: Maxime Ripard @ 2014-10-17 9:38 UTC (permalink / raw)
To: linux-arm-kernel
The current GPL only licensing on the DTSI makes it very impractical for other
software components licensed under another license.
In order to make it easier for them to reuse our device trees, relicense our
device trees under a GPL/X11 dual-license.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Hans de Goede <hdegoede@redhat.com>
---
arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 46 ++++++++++++++++++++++++++----
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
index b9ecce60f2e7..8b3f97470249 100644
--- a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
+++ b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
@@ -3,12 +3,48 @@
*
* Maxime Ripard <maxime.ripard@free-electrons.com>
*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
*
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
--
2.1.1
^ permalink raw reply related [flat|nested] 67+ messages in thread* [PATCH 09/26] ARM: sun4i: olinuxino lime: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording Maxime Ripard
` (6 preceding siblings ...)
2014-10-17 9:38 ` [PATCH 08/26] ARM: sun4i: mini xplus: " Maxime Ripard
@ 2014-10-17 9:38 ` Maxime Ripard
2014-10-21 17:20 ` Maxime Ripard
2014-10-17 9:38 ` [PATCH 10/26] " Maxime Ripard
` (19 subsequent siblings)
27 siblings, 1 reply; 67+ messages in thread
From: Maxime Ripard @ 2014-10-17 9:38 UTC (permalink / raw)
To: linux-arm-kernel
The current GPL only licensing on the DTSI makes it very impractical for other
software components licensed under another license.
In order to make it easier for them to reuse our device trees, relicense our
device trees under a GPL/X11 dual-license.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Hans de Goede <hdegoede@redhat.com>
---
arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 46 +++++++++++++++++++++++---
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
index d046d568f5a1..88cf1a531155 100644
--- a/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
+++ b/arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
@@ -1,12 +1,48 @@
/*
* Copyright 2014 - Hans de Goede <hdegoede@redhat.com>
*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
*
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
--
2.1.1
^ permalink raw reply related [flat|nested] 67+ messages in thread* [PATCH 10/26] ARM: sun4i: olinuxino lime: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording Maxime Ripard
` (7 preceding siblings ...)
2014-10-17 9:38 ` [PATCH 09/26] ARM: sun4i: olinuxino lime: " Maxime Ripard
@ 2014-10-17 9:38 ` Maxime Ripard
2014-11-05 8:18 ` Maxime Ripard
2014-10-17 9:38 ` [PATCH 11/26] ARM: sun5i: olinuxino micro: " Maxime Ripard
` (18 subsequent siblings)
27 siblings, 1 reply; 67+ messages in thread
From: Maxime Ripard @ 2014-10-17 9:38 UTC (permalink / raw)
To: linux-arm-kernel
The current GPL only licensing on the DTSI makes it very impractical for other
software components licensed under another license.
In order to make it easier for them to reuse our device trees, relicense our
device trees under a GPL/X11 dual-license.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Zoltan HERPAI <wigyori@uid0.hu>
---
arch/arm/boot/dts/sun4i-a10-pcduino.dts | 46 +++++++++++++++++++++++++++++----
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/sun4i-a10-pcduino.dts b/arch/arm/boot/dts/sun4i-a10-pcduino.dts
index 6675bcd7860e..ce5994597407 100644
--- a/arch/arm/boot/dts/sun4i-a10-pcduino.dts
+++ b/arch/arm/boot/dts/sun4i-a10-pcduino.dts
@@ -2,12 +2,48 @@
* Copyright 2014 Zoltan HERPAI
* Zoltan HERPAI <wigyori@uid0.hu>
*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
*
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
--
2.1.1
^ permalink raw reply related [flat|nested] 67+ messages in thread* [PATCH 10/26] ARM: sun4i: olinuxino lime: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 ` [PATCH 10/26] " Maxime Ripard
@ 2014-11-05 8:18 ` Maxime Ripard
0 siblings, 0 replies; 67+ messages in thread
From: Maxime Ripard @ 2014-11-05 8:18 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Oct 17, 2014 at 11:38:32AM +0200, Maxime Ripard wrote:
> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
>
> In order to make it easier for them to reuse our device trees, relicense our
> device trees under a GPL/X11 dual-license.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Carlo Caione <carlo@caione.org>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Cc: Zoltan HERPAI <wigyori@uid0.hu>
Applied, with Carlo, Hans and Zoltan Acked-by, and fixed the commit name.
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141105/8798783b/attachment-0001.sig>
^ permalink raw reply [flat|nested] 67+ messages in thread
* [PATCH 11/26] ARM: sun5i: olinuxino micro: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording Maxime Ripard
` (8 preceding siblings ...)
2014-10-17 9:38 ` [PATCH 10/26] " Maxime Ripard
@ 2014-10-17 9:38 ` Maxime Ripard
2014-10-21 17:27 ` Maxime Ripard
2014-10-17 9:38 ` [PATCH 12/26] ARM: sun5i: r7: " Maxime Ripard
` (17 subsequent siblings)
27 siblings, 1 reply; 67+ messages in thread
From: Maxime Ripard @ 2014-10-17 9:38 UTC (permalink / raw)
To: linux-arm-kernel
The current GPL only licensing on the DTSI makes it very impractical for other
software components licensed under another license.
In order to make it easier for them to reuse our device trees, relicense our
device trees under a GPL/X11 dual-license.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Emilio L?pez <emilio@elopez.com.ar>
Cc: Hans de Goede <hdegoede@redhat.com>
---
arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 46 +++++++++++++++++++++---
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
index ea9519da5764..fe3c559ca6a8 100644
--- a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
@@ -3,12 +3,48 @@
*
* Maxime Ripard <maxime.ripard@free-electrons.com>
*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
*
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
--
2.1.1
^ permalink raw reply related [flat|nested] 67+ messages in thread* [PATCH 12/26] ARM: sun5i: r7: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording Maxime Ripard
` (9 preceding siblings ...)
2014-10-17 9:38 ` [PATCH 11/26] ARM: sun5i: olinuxino micro: " Maxime Ripard
@ 2014-10-17 9:38 ` Maxime Ripard
2014-10-21 17:26 ` Maxime Ripard
2014-10-17 9:38 ` [PATCH 13/26] ARM: sun5i: olinuxino: " Maxime Ripard
` (16 subsequent siblings)
27 siblings, 1 reply; 67+ messages in thread
From: Maxime Ripard @ 2014-10-17 9:38 UTC (permalink / raw)
To: linux-arm-kernel
The current GPL only licensing on the DTSI makes it very impractical for other
software components licensed under another license.
In order to make it easier for them to reuse our device trees, relicense our
device trees under a GPL/X11 dual-license.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Hans de Goede <hdegoede@redhat.com>
---
arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 46 ++++++++++++++++++++++++---
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts b/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
index 43a93762d4f2..1fa2916eafc2 100644
--- a/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
@@ -1,12 +1,48 @@
/*
* Copyright 2014 Hans de Goede <hdegoede@redhat.com>
*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
*
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
--
2.1.1
^ permalink raw reply related [flat|nested] 67+ messages in thread* [PATCH 13/26] ARM: sun5i: olinuxino: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording Maxime Ripard
` (10 preceding siblings ...)
2014-10-17 9:38 ` [PATCH 12/26] ARM: sun5i: r7: " Maxime Ripard
@ 2014-10-17 9:38 ` Maxime Ripard
2014-11-07 12:29 ` Maxime Ripard
2014-10-17 9:38 ` [PATCH 14/26] ARM: sun5i: olinuxino micro: " Maxime Ripard
` (15 subsequent siblings)
27 siblings, 1 reply; 67+ messages in thread
From: Maxime Ripard @ 2014-10-17 9:38 UTC (permalink / raw)
To: linux-arm-kernel
The current GPL only licensing on the DTSI makes it very impractical for other
software components licensed under another license.
In order to make it easier for them to reuse our device trees, relicense our
device trees under a GPL/X11 dual-license.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Olof Johansson <olof@lixom.net>
Cc: Roman Byshko <rbyshko@gmail.com>
---
arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 46 +++++++++++++++++++++++++++----
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
index 429994e1943e..e31d291d14cb 100644
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
@@ -3,12 +3,48 @@
*
* Maxime Ripard <maxime.ripard@free-electrons.com>
*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
*
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
--
2.1.1
^ permalink raw reply related [flat|nested] 67+ messages in thread* [PATCH 14/26] ARM: sun5i: olinuxino micro: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording Maxime Ripard
` (11 preceding siblings ...)
2014-10-17 9:38 ` [PATCH 13/26] ARM: sun5i: olinuxino: " Maxime Ripard
@ 2014-10-17 9:38 ` Maxime Ripard
2014-10-21 17:25 ` Maxime Ripard
2014-10-17 9:38 ` [PATCH 15/26] ARM: sun6i: app4: " Maxime Ripard
` (14 subsequent siblings)
27 siblings, 1 reply; 67+ messages in thread
From: Maxime Ripard @ 2014-10-17 9:38 UTC (permalink / raw)
To: linux-arm-kernel
The current GPL only licensing on the DTSI makes it very impractical for other
software components licensed under another license.
In order to make it easier for them to reuse our device trees, relicense our
device trees under a GPL/X11 dual-license.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Hans de Goede <hdegoede@redhat.com>
---
arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 48 +++++++++++++++++++++----
1 file changed, 41 insertions(+), 7 deletions(-)
diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
index fa44b026483b..916ee8bb826f 100644
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
@@ -1,15 +1,49 @@
/*
- * Copyright 2012 Maxime Ripard
+ * Copyright 2012 Maxime Ripard <maxime.ripard@free-electrons.com>
* Copyright 2013 Hans de Goede <hdegoede@redhat.com>
*
- * Maxime Ripard <maxime.ripard@free-electrons.com>
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
+ * 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.
*
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
--
2.1.1
^ permalink raw reply related [flat|nested] 67+ messages in thread* [PATCH 15/26] ARM: sun6i: app4: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording Maxime Ripard
` (12 preceding siblings ...)
2014-10-17 9:38 ` [PATCH 14/26] ARM: sun5i: olinuxino micro: " Maxime Ripard
@ 2014-10-17 9:38 ` Maxime Ripard
2014-10-24 7:05 ` Boris Brezillon
2014-10-27 22:04 ` Maxime Ripard
2014-10-17 9:38 ` [PATCH 16/26] ARM: sun6i: colombus: " Maxime Ripard
` (13 subsequent siblings)
27 siblings, 2 replies; 67+ messages in thread
From: Maxime Ripard @ 2014-10-17 9:38 UTC (permalink / raw)
To: linux-arm-kernel
The current GPL only licensing on the DTSI makes it very impractical for other
software components licensed under another license.
In order to make it easier for them to reuse our device trees, relicense our
device trees under a GPL/X11 dual-license.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Boris BREZILLON <boris.brezillon@free-electrons.com>
---
arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | 46 +++++++++++++++++++++++++++----
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts b/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts
index 2bbf8867362b..c74a63a39531 100644
--- a/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts
+++ b/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts
@@ -3,12 +3,48 @@
*
* Boris Brezillon <boris.brezillon@free-electrons.com>
*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
*
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
--
2.1.1
^ permalink raw reply related [flat|nested] 67+ messages in thread* [PATCH 15/26] ARM: sun6i: app4: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 ` [PATCH 15/26] ARM: sun6i: app4: " Maxime Ripard
@ 2014-10-24 7:05 ` Boris Brezillon
2014-10-27 22:04 ` Maxime Ripard
1 sibling, 0 replies; 67+ messages in thread
From: Boris Brezillon @ 2014-10-24 7:05 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, 17 Oct 2014 11:38:37 +0200
Maxime Ripard <maxime.ripard@free-electrons.com> wrote:
> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
>
> In order to make it easier for them to reuse our device trees, relicense our
> device trees under a GPL/X11 dual-license.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> Cc: Boris BREZILLON <boris.brezillon@free-electrons.com>
> ---
> arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | 46 +++++++++++++++++++++++++++----
> 1 file changed, 41 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts b/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts
> index 2bbf8867362b..c74a63a39531 100644
> --- a/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts
> +++ b/arch/arm/boot/dts/sun6i-a31-app4-evb1.dts
> @@ -3,12 +3,48 @@
> *
> * Boris Brezillon <boris.brezillon@free-electrons.com>
> *
> - * The code contained herein is licensed under the GNU General Public
> - * License. You may obtain a copy of the GNU General Public License
> - * Version 2 or later at the following locations:
> + * This file is dual-licensed: you can use it either under the terms
> + * of the GPL or the X11 license, at your option. Note that this dual
> + * licensing only applies to this file, and not this project as a
> + * whole.
> *
> - * http://www.opensource.org/licenses/gpl-license.html
> - * http://www.gnu.org/copyleft/gpl.html
> + * 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.
> + *
> + * You should have received a copy of the GNU General Public
> + * License along with this file; if not, write to the Free
> + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
> + * MA 02110-1301 USA
> + *
> + * Or, alternatively,
> + *
> + * b) Permission is hereby granted, free of charge, to any person
> + * obtaining a copy of this software and associated documentation
> + * files (the "Software"), to deal in the Software without
> + * restriction, including without limitation the rights to use,
> + * copy, modify, merge, publish, distribute, sublicense, and/or
> + * sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following
> + * conditions:
> + *
> + * The above copyright notice and this permission notice shall be
> + * included in all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
> + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
> + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> */
>
> /dts-v1/;
--
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 67+ messages in thread
* [PATCH 15/26] ARM: sun6i: app4: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 ` [PATCH 15/26] ARM: sun6i: app4: " Maxime Ripard
2014-10-24 7:05 ` Boris Brezillon
@ 2014-10-27 22:04 ` Maxime Ripard
1 sibling, 0 replies; 67+ messages in thread
From: Maxime Ripard @ 2014-10-27 22:04 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Oct 17, 2014 at 11:38:37AM +0200, Maxime Ripard wrote:
> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
>
> In order to make it easier for them to reuse our device trees, relicense our
> device trees under a GPL/X11 dual-license.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Boris BREZILLON <boris.brezillon@free-electrons.com>
Applied with Boris' Acked-by.
Thanks!
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141027/b332f72c/attachment.sig>
^ permalink raw reply [flat|nested] 67+ messages in thread
* [PATCH 16/26] ARM: sun6i: colombus: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording Maxime Ripard
` (13 preceding siblings ...)
2014-10-17 9:38 ` [PATCH 15/26] ARM: sun6i: app4: " Maxime Ripard
@ 2014-10-17 9:38 ` Maxime Ripard
2014-10-21 17:29 ` Maxime Ripard
2014-10-17 9:38 ` [PATCH 17/26] ARM: sun6i: hummingbird: " Maxime Ripard
` (12 subsequent siblings)
27 siblings, 1 reply; 67+ messages in thread
From: Maxime Ripard @ 2014-10-17 9:38 UTC (permalink / raw)
To: linux-arm-kernel
The current GPL only licensing on the DTSI makes it very impractical for other
software components licensed under another license.
In order to make it easier for them to reuse our device trees, relicense our
device trees under a GPL/X11 dual-license.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/boot/dts/sun6i-a31-colombus.dts | 46 ++++++++++++++++++++++++++++----
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/sun6i-a31-colombus.dts b/arch/arm/boot/dts/sun6i-a31-colombus.dts
index 546cf6eff5c7..c36b4dc89c13 100644
--- a/arch/arm/boot/dts/sun6i-a31-colombus.dts
+++ b/arch/arm/boot/dts/sun6i-a31-colombus.dts
@@ -3,12 +3,48 @@
*
* Maxime Ripard <maxime.ripard@free-electrons.com>
*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
*
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
--
2.1.1
^ permalink raw reply related [flat|nested] 67+ messages in thread* [PATCH 17/26] ARM: sun6i: hummingbird: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording Maxime Ripard
` (14 preceding siblings ...)
2014-10-17 9:38 ` [PATCH 16/26] ARM: sun6i: colombus: " Maxime Ripard
@ 2014-10-17 9:38 ` Maxime Ripard
2014-10-21 17:29 ` Maxime Ripard
2014-10-17 9:38 ` [PATCH 18/26] ARM: sun6i: m9: " Maxime Ripard
` (11 subsequent siblings)
27 siblings, 1 reply; 67+ messages in thread
From: Maxime Ripard @ 2014-10-17 9:38 UTC (permalink / raw)
To: linux-arm-kernel
The current GPL only licensing on the DTSI makes it very impractical for other
software components licensed under another license.
In order to make it easier for them to reuse our device trees, relicense our
device trees under a GPL/X11 dual-license.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 46 +++++++++++++++++++++++++----
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
index f142065b3c1f..6e924d9d2912 100644
--- a/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
+++ b/arch/arm/boot/dts/sun6i-a31-hummingbird.dts
@@ -3,12 +3,48 @@
*
* Maxime Ripard <maxime.ripard@free-electrons.com>
*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
*
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
--
2.1.1
^ permalink raw reply related [flat|nested] 67+ messages in thread* [PATCH 18/26] ARM: sun6i: m9: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording Maxime Ripard
` (15 preceding siblings ...)
2014-10-17 9:38 ` [PATCH 17/26] ARM: sun6i: hummingbird: " Maxime Ripard
@ 2014-10-17 9:38 ` Maxime Ripard
2014-10-21 17:30 ` Maxime Ripard
2014-10-17 9:38 ` [PATCH 19/26] ARM: sun7i: cubieboard2: " Maxime Ripard
` (10 subsequent siblings)
27 siblings, 1 reply; 67+ messages in thread
From: Maxime Ripard @ 2014-10-17 9:38 UTC (permalink / raw)
To: linux-arm-kernel
The current GPL only licensing on the DTSI makes it very impractical for other
software components licensed under another license.
In order to make it easier for them to reuse our device trees, relicense our
device trees under a GPL/X11 dual-license.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Hans de Goede <hdegoede@redhat.com>
---
arch/arm/boot/dts/sun6i-a31-m9.dts | 46 +++++++++++++++++++++++++++++++++-----
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/sun6i-a31-m9.dts b/arch/arm/boot/dts/sun6i-a31-m9.dts
index bc6115da5ae1..c887be6cea3d 100644
--- a/arch/arm/boot/dts/sun6i-a31-m9.dts
+++ b/arch/arm/boot/dts/sun6i-a31-m9.dts
@@ -1,12 +1,48 @@
/*
* Copyright 2014 Hans de Goede <hdegoede@redhat.com>
*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
*
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
--
2.1.1
^ permalink raw reply related [flat|nested] 67+ messages in thread* [PATCH 19/26] ARM: sun7i: cubieboard2: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording Maxime Ripard
` (16 preceding siblings ...)
2014-10-17 9:38 ` [PATCH 18/26] ARM: sun6i: m9: " Maxime Ripard
@ 2014-10-17 9:38 ` Maxime Ripard
2015-01-14 12:41 ` Maxime Ripard
2014-10-17 9:38 ` [PATCH 20/26] ARM: sun7i: cubietruck: " Maxime Ripard
` (9 subsequent siblings)
27 siblings, 1 reply; 67+ messages in thread
From: Maxime Ripard @ 2014-10-17 9:38 UTC (permalink / raw)
To: linux-arm-kernel
The current GPL only licensing on the DTSI makes it very impractical for other
software components licensed under another license.
In order to make it easier for them to reuse our device trees, relicense our
device trees under a GPL/X11 dual-license.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Alexander Bersenev <bay@hackerdom.ru>
Cc: Carlo Caione <carlo@caione.org>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Roman Byshko <rbyshko@gmail.com>
---
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 46 +++++++++++++++++++++++++----
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
index 53680983461a..37bf796a821f 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
@@ -3,12 +3,48 @@
*
* Maxime Ripard <maxime.ripard@free-electrons.com>
*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
*
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
--
2.1.1
^ permalink raw reply related [flat|nested] 67+ messages in thread* [PATCH 19/26] ARM: sun7i: cubieboard2: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 ` [PATCH 19/26] ARM: sun7i: cubieboard2: " Maxime Ripard
@ 2015-01-14 12:41 ` Maxime Ripard
0 siblings, 0 replies; 67+ messages in thread
From: Maxime Ripard @ 2015-01-14 12:41 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Oct 17, 2014 at 11:38:41AM +0200, Maxime Ripard wrote:
> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
>
> In order to make it easier for them to reuse our device trees, relicense our
> device trees under a GPL/X11 dual-license.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Alexander Bersenev <bay@hackerdom.ru>
> Cc: Carlo Caione <carlo@caione.org>
> Cc: Chen-Yu Tsai <wens@csie.org>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Cc: Roman Byshko <rbyshko@gmail.com>
Applied. Thanks!
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150114/bec408ee/attachment.sig>
^ permalink raw reply [flat|nested] 67+ messages in thread
* [PATCH 20/26] ARM: sun7i: cubietruck: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording Maxime Ripard
` (17 preceding siblings ...)
2014-10-17 9:38 ` [PATCH 19/26] ARM: sun7i: cubieboard2: " Maxime Ripard
@ 2014-10-17 9:38 ` Maxime Ripard
2014-10-17 9:54 ` Alexandre Belloni
` (2 more replies)
2014-10-17 9:38 ` [PATCH 21/26] ARM: sun7i: hummingbird: " Maxime Ripard
` (8 subsequent siblings)
27 siblings, 3 replies; 67+ messages in thread
From: Maxime Ripard @ 2014-10-17 9:38 UTC (permalink / raw)
To: linux-arm-kernel
The current GPL only licensing on the DTSI makes it very impractical for other
software components licensed under another license.
In order to make it easier for them to reuse our device trees, relicense our
device trees under a GPL/X11 dual-license.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Alexander Bersenev <bay@hackerdom.ru>
Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Oliver Schinagl <oliver@schinagl.nl>
---
arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 46 ++++++++++++++++++++++++++----
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
index a6c1a3c717bc..e1a642b207db 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
@@ -3,12 +3,48 @@
*
* Oliver Schinagl <oliver@schinagl.nl>
*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
*
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
--
2.1.1
^ permalink raw reply related [flat|nested] 67+ messages in thread* [PATCH 20/26] ARM: sun7i: cubietruck: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 ` [PATCH 20/26] ARM: sun7i: cubietruck: " Maxime Ripard
@ 2014-10-17 9:54 ` Alexandre Belloni
2014-10-20 11:32 ` Carlo Caione
2015-01-14 12:42 ` Maxime Ripard
2 siblings, 0 replies; 67+ messages in thread
From: Alexandre Belloni @ 2014-10-17 9:54 UTC (permalink / raw)
To: linux-arm-kernel
On 17/10/2014 at 11:38:42 +0200, Maxime Ripard wrote :
> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
>
> In order to make it easier for them to reuse our device trees, relicense our
> device trees under a GPL/X11 dual-license.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> Cc: Alexander Bersenev <bay@hackerdom.ru>
> Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> Cc: Carlo Caione <carlo@caione.org>
> Cc: Chen-Yu Tsai <wens@csie.org>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Cc: Oliver Schinagl <oliver@schinagl.nl>
> ---
> arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 46 ++++++++++++++++++++++++++----
> 1 file changed, 41 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
> index a6c1a3c717bc..e1a642b207db 100644
> --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
> +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
> @@ -3,12 +3,48 @@
> *
> * Oliver Schinagl <oliver@schinagl.nl>
> *
> - * The code contained herein is licensed under the GNU General Public
> - * License. You may obtain a copy of the GNU General Public License
> - * Version 2 or later at the following locations:
> + * This file is dual-licensed: you can use it either under the terms
> + * of the GPL or the X11 license, at your option. Note that this dual
> + * licensing only applies to this file, and not this project as a
> + * whole.
> *
> - * http://www.opensource.org/licenses/gpl-license.html
> - * http://www.gnu.org/copyleft/gpl.html
> + * 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.
> + *
> + * You should have received a copy of the GNU General Public
> + * License along with this file; if not, write to the Free
> + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
> + * MA 02110-1301 USA
> + *
> + * Or, alternatively,
> + *
> + * b) Permission is hereby granted, free of charge, to any person
> + * obtaining a copy of this software and associated documentation
> + * files (the "Software"), to deal in the Software without
> + * restriction, including without limitation the rights to use,
> + * copy, modify, merge, publish, distribute, sublicense, and/or
> + * sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following
> + * conditions:
> + *
> + * The above copyright notice and this permission notice shall be
> + * included in all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
> + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
> + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> */
>
> /dts-v1/;
> --
> 2.1.1
>
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 67+ messages in thread
* [PATCH 20/26] ARM: sun7i: cubietruck: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 ` [PATCH 20/26] ARM: sun7i: cubietruck: " Maxime Ripard
2014-10-17 9:54 ` Alexandre Belloni
@ 2014-10-20 11:32 ` Carlo Caione
2015-01-14 12:42 ` Maxime Ripard
2 siblings, 0 replies; 67+ messages in thread
From: Carlo Caione @ 2014-10-20 11:32 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Oct 17, 2014 at 11:38:42AM +0200, Maxime Ripard wrote:
> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
>
> In order to make it easier for them to reuse our device trees, relicense our
> device trees under a GPL/X11 dual-license.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Carlo Caione <carlo@caione.org>
--
Carlo Caione
^ permalink raw reply [flat|nested] 67+ messages in thread
* [PATCH 20/26] ARM: sun7i: cubietruck: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 ` [PATCH 20/26] ARM: sun7i: cubietruck: " Maxime Ripard
2014-10-17 9:54 ` Alexandre Belloni
2014-10-20 11:32 ` Carlo Caione
@ 2015-01-14 12:42 ` Maxime Ripard
2 siblings, 0 replies; 67+ messages in thread
From: Maxime Ripard @ 2015-01-14 12:42 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Oct 17, 2014 at 11:38:42AM +0200, Maxime Ripard wrote:
> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
>
> In order to make it easier for them to reuse our device trees, relicense our
> device trees under a GPL/X11 dual-license.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Alexander Bersenev <bay@hackerdom.ru>
> Cc: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> Cc: Carlo Caione <carlo@caione.org>
> Cc: Chen-Yu Tsai <wens@csie.org>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Cc: Oliver Schinagl <oliver@schinagl.nl>
Applied, thanks!
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20150114/db104fa3/attachment.sig>
^ permalink raw reply [flat|nested] 67+ messages in thread
* [PATCH 21/26] ARM: sun7i: hummingbird: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording Maxime Ripard
` (18 preceding siblings ...)
2014-10-17 9:38 ` [PATCH 20/26] ARM: sun7i: cubietruck: " Maxime Ripard
@ 2014-10-17 9:38 ` Maxime Ripard
2015-01-30 4:03 ` Wills Wang
2014-10-17 9:38 ` [PATCH 22/26] " Maxime Ripard
` (7 subsequent siblings)
27 siblings, 1 reply; 67+ messages in thread
From: Maxime Ripard @ 2014-10-17 9:38 UTC (permalink / raw)
To: linux-arm-kernel
The current GPL only licensing on the DTSI makes it very impractical for other
software components licensed under another license.
In order to make it easier for them to reuse our device trees, relicense our
device trees under a GPL/X11 dual-license.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Wills Wang <wills.wang.open@gmail.com>
---
arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 46 +++++++++++++++++++++++++----
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
index 0e4bfa3b2b85..93763214caa9 100644
--- a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
+++ b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
@@ -3,12 +3,48 @@
*
* Wills Wang <wills.wang.open@gmail.com>
*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
*
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
--
2.1.1
^ permalink raw reply related [flat|nested] 67+ messages in thread* [PATCH 21/26] ARM: sun7i: hummingbird: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 ` [PATCH 21/26] ARM: sun7i: hummingbird: " Maxime Ripard
@ 2015-01-30 4:03 ` Wills Wang
2015-01-30 13:26 ` Maxime Ripard
0 siblings, 1 reply; 67+ messages in thread
From: Wills Wang @ 2015-01-30 4:03 UTC (permalink / raw)
To: linux-arm-kernel
Acked-by: Wills Wang <wills.wang.open@gmail.com>
On 10/17/2014 05:38 PM, Maxime Ripard wrote:
> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
>
> In order to make it easier for them to reuse our device trees, relicense our
> device trees under a GPL/X11 dual-license.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Wills Wang <wills.wang.open@gmail.com>
> ---
> arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 46 +++++++++++++++++++++++++----
> 1 file changed, 41 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
> index 0e4bfa3b2b85..93763214caa9 100644
> --- a/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
> +++ b/arch/arm/boot/dts/sun7i-a20-hummingbird.dts
> @@ -3,12 +3,48 @@
> *
> * Wills Wang <wills.wang.open@gmail.com>
> *
> - * The code contained herein is licensed under the GNU General Public
> - * License. You may obtain a copy of the GNU General Public License
> - * Version 2 or later at the following locations:
> + * This file is dual-licensed: you can use it either under the terms
> + * of the GPL or the X11 license, at your option. Note that this dual
> + * licensing only applies to this file, and not this project as a
> + * whole.
> *
> - * http://www.opensource.org/licenses/gpl-license.html
> - * http://www.gnu.org/copyleft/gpl.html
> + * 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.
> + *
> + * You should have received a copy of the GNU General Public
> + * License along with this file; if not, write to the Free
> + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
> + * MA 02110-1301 USA
> + *
> + * Or, alternatively,
> + *
> + * b) Permission is hereby granted, free of charge, to any person
> + * obtaining a copy of this software and associated documentation
> + * files (the "Software"), to deal in the Software without
> + * restriction, including without limitation the rights to use,
> + * copy, modify, merge, publish, distribute, sublicense, and/or
> + * sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following
> + * conditions:
> + *
> + * The above copyright notice and this permission notice shall be
> + * included in all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
> + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
> + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> */
>
> /dts-v1/;
^ permalink raw reply [flat|nested] 67+ messages in thread
* [PATCH 22/26] ARM: sun7i: hummingbird: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording Maxime Ripard
` (19 preceding siblings ...)
2014-10-17 9:38 ` [PATCH 21/26] ARM: sun7i: hummingbird: " Maxime Ripard
@ 2014-10-17 9:38 ` Maxime Ripard
2014-10-21 17:31 ` Maxime Ripard
2014-10-17 9:38 ` [PATCH 23/26] ARM: sun7i: olinuxino lime: " Maxime Ripard
` (6 subsequent siblings)
27 siblings, 1 reply; 67+ messages in thread
From: Maxime Ripard @ 2014-10-17 9:38 UTC (permalink / raw)
To: linux-arm-kernel
The current GPL only licensing on the DTSI makes it very impractical for other
software components licensed under another license.
In order to make it easier for them to reuse our device trees, relicense our
device trees under a GPL/X11 dual-license.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Hans de Goede <hdegoede@redhat.com>
---
arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 46 +++++++++++++++++++++++++++----
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
index 6a67712d417a..f38bb1a6656c 100644
--- a/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
+++ b/arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
@@ -1,12 +1,48 @@
/*
* Copyright 2014 Hans de Goede <hdegoede@redhat.com>
*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
*
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
--
2.1.1
^ permalink raw reply related [flat|nested] 67+ messages in thread* [PATCH 22/26] ARM: sun7i: hummingbird: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 ` [PATCH 22/26] " Maxime Ripard
@ 2014-10-21 17:31 ` Maxime Ripard
0 siblings, 0 replies; 67+ messages in thread
From: Maxime Ripard @ 2014-10-21 17:31 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Oct 17, 2014 at 11:38:44AM +0200, Maxime Ripard wrote:
> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
>
> In order to make it easier for them to reuse our device trees, relicense our
> device trees under a GPL/X11 dual-license.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Carlo Caione <carlo@caione.org>
> Cc: Hans de Goede <hdegoede@redhat.com>
Fix the commit title and applied with Carlo and Hans' Acked-by
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141021/55d72cab/attachment.sig>
^ permalink raw reply [flat|nested] 67+ messages in thread
* [PATCH 23/26] ARM: sun7i: olinuxino lime: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording Maxime Ripard
` (20 preceding siblings ...)
2014-10-17 9:38 ` [PATCH 22/26] " Maxime Ripard
@ 2014-10-17 9:38 ` Maxime Ripard
2014-11-04 14:50 ` Naoki FUKAUMI
2014-10-17 9:38 ` [PATCH 24/26] ARM: sun7i: olinuxino micro: " Maxime Ripard
` (5 subsequent siblings)
27 siblings, 1 reply; 67+ messages in thread
From: Maxime Ripard @ 2014-10-17 9:38 UTC (permalink / raw)
To: linux-arm-kernel
The current GPL only licensing on the DTSI makes it very impractical for other
software components licensed under another license.
In order to make it easier for them to reuse our device trees, relicense our
device trees under a GPL/X11 dual-license.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: FUKAUMI Naoki <naobsd@gmail.com>
---
arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 46 +++++++++++++++++++++++---
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
index 1eb8175959a6..3f3ff9693992 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
@@ -4,12 +4,48 @@
* Copyright 2014 - Hans de Goede <hdegoede@redhat.com>
* Copyright (c) 2014 FUKAUMI Naoki <naobsd@gmail.com>
*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
*
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
--
2.1.1
^ permalink raw reply related [flat|nested] 67+ messages in thread* [PATCH 23/26] ARM: sun7i: olinuxino lime: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 ` [PATCH 23/26] ARM: sun7i: olinuxino lime: " Maxime Ripard
@ 2014-11-04 14:50 ` Naoki FUKAUMI
2014-11-04 15:26 ` Maxime Ripard
0 siblings, 1 reply; 67+ messages in thread
From: Naoki FUKAUMI @ 2014-11-04 14:50 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
sorry for late reply!
On Fri, Oct 17, 2014 at 6:38 PM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
>
> In order to make it easier for them to reuse our device trees, relicense our
> device trees under a GPL/X11 dual-license.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: FUKAUMI Naoki <naobsd@gmail.com>
> ---
> arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 46 +++++++++++++++++++++++---
> 1 file changed, 41 insertions(+), 5 deletions(-)
Acked-by: FUKAUMI Naoki <naobsd@gmail.com>
Regards,
^ permalink raw reply [flat|nested] 67+ messages in thread
* [PATCH 23/26] ARM: sun7i: olinuxino lime: Relicense the device tree under GPLv2/X11
2014-11-04 14:50 ` Naoki FUKAUMI
@ 2014-11-04 15:26 ` Maxime Ripard
0 siblings, 0 replies; 67+ messages in thread
From: Maxime Ripard @ 2014-11-04 15:26 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Nov 04, 2014 at 11:50:15PM +0900, Naoki FUKAUMI wrote:
> Hi,
>
> sorry for late reply!
>
> On Fri, Oct 17, 2014 at 6:38 PM, Maxime Ripard
> <maxime.ripard@free-electrons.com> wrote:
> > The current GPL only licensing on the DTSI makes it very impractical for other
> > software components licensed under another license.
> >
> > In order to make it easier for them to reuse our device trees, relicense our
> > device trees under a GPL/X11 dual-license.
> >
> > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> > Cc: FUKAUMI Naoki <naobsd@gmail.com>
> > ---
> > arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 46 +++++++++++++++++++++++---
> > 1 file changed, 41 insertions(+), 5 deletions(-)
>
> Acked-by: FUKAUMI Naoki <naobsd@gmail.com>
Applied with your Acked-by.
Thanks!
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141104/ef30efa8/attachment.sig>
^ permalink raw reply [flat|nested] 67+ messages in thread
* [PATCH 24/26] ARM: sun7i: olinuxino micro: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording Maxime Ripard
` (21 preceding siblings ...)
2014-10-17 9:38 ` [PATCH 23/26] ARM: sun7i: olinuxino lime: " Maxime Ripard
@ 2014-10-17 9:38 ` Maxime Ripard
2015-02-04 18:40 ` Zalan Blenessy
2014-10-17 9:38 ` [PATCH 25/26] ARM: sun7i: pcduino3: " Maxime Ripard
` (4 subsequent siblings)
27 siblings, 1 reply; 67+ messages in thread
From: Maxime Ripard @ 2014-10-17 9:38 UTC (permalink / raw)
To: linux-arm-kernel
The current GPL only licensing on the DTSI makes it very impractical for other
software components licensed under another license.
In order to make it easier for them to reuse our device trees, relicense our
device trees under a GPL/X11 dual-license.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Carlo Caione <carlo@caione.org>
Cc: Chen-Yu Tsai <wens@csie.org>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Zalan Blenessy <zalan.blenessy@gmail.com>
---
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 46 ++++++++++++++++++++++---
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
index 9d669cdf031d..2d15d37f767e 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
@@ -3,12 +3,48 @@
*
* Maxime Ripard <maxime.ripard@free-electrons.com>
*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
*
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
--
2.1.1
^ permalink raw reply related [flat|nested] 67+ messages in thread* [PATCH 25/26] ARM: sun7i: pcduino3: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording Maxime Ripard
` (22 preceding siblings ...)
2014-10-17 9:38 ` [PATCH 24/26] ARM: sun7i: olinuxino micro: " Maxime Ripard
@ 2014-10-17 9:38 ` Maxime Ripard
2014-11-04 22:46 ` Zoltan HERPAI
2014-11-05 8:19 ` Maxime Ripard
2014-10-17 9:38 ` [PATCH 26/26] ARM: sun8i: q8h: " Maxime Ripard
` (3 subsequent siblings)
27 siblings, 2 replies; 67+ messages in thread
From: Maxime Ripard @ 2014-10-17 9:38 UTC (permalink / raw)
To: linux-arm-kernel
The current GPL only licensing on the DTSI makes it very impractical for other
software components licensed under another license.
In order to make it easier for them to reuse our device trees, relicense our
device trees under a GPL/X11 dual-license.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Zoltan HERPAI <wigyori@uid0.hu>
---
arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 46 ++++++++++++++++++++++++++++----
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
index 046dfc0d45d8..8dca49b2477b 100644
--- a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
+++ b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
@@ -2,12 +2,48 @@
* Copyright 2014 Zoltan HERPAI
* Zoltan HERPAI <wigyori@uid0.hu>
*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
*
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
--
2.1.1
^ permalink raw reply related [flat|nested] 67+ messages in thread* [PATCH 25/26] ARM: sun7i: pcduino3: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 ` [PATCH 25/26] ARM: sun7i: pcduino3: " Maxime Ripard
@ 2014-11-04 22:46 ` Zoltan HERPAI
2014-11-05 8:19 ` Maxime Ripard
1 sibling, 0 replies; 67+ messages in thread
From: Zoltan HERPAI @ 2014-11-04 22:46 UTC (permalink / raw)
To: linux-arm-kernel
Hi Maxime,
As discussed:
Acked-by: Zoltan HERPAI <wigyori@uid0.hu>
Thanks,
-w-
Maxime Ripard wrote:
> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
>
> In order to make it easier for them to reuse our device trees, relicense our
> device trees under a GPL/X11 dual-license.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Zoltan HERPAI <wigyori@uid0.hu>
> ---
> arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 46 ++++++++++++++++++++++++++++----
> 1 file changed, 41 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
> index 046dfc0d45d8..8dca49b2477b 100644
> --- a/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
> +++ b/arch/arm/boot/dts/sun7i-a20-pcduino3.dts
> @@ -2,12 +2,48 @@
> * Copyright 2014 Zoltan HERPAI
> * Zoltan HERPAI <wigyori@uid0.hu>
> *
> - * The code contained herein is licensed under the GNU General Public
> - * License. You may obtain a copy of the GNU General Public License
> - * Version 2 or later at the following locations:
> + * This file is dual-licensed: you can use it either under the terms
> + * of the GPL or the X11 license, at your option. Note that this dual
> + * licensing only applies to this file, and not this project as a
> + * whole.
> *
> - * http://www.opensource.org/licenses/gpl-license.html
> - * http://www.gnu.org/copyleft/gpl.html
> + * 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.
> + *
> + * You should have received a copy of the GNU General Public
> + * License along with this file; if not, write to the Free
> + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
> + * MA 02110-1301 USA
> + *
> + * Or, alternatively,
> + *
> + * b) Permission is hereby granted, free of charge, to any person
> + * obtaining a copy of this software and associated documentation
> + * files (the "Software"), to deal in the Software without
> + * restriction, including without limitation the rights to use,
> + * copy, modify, merge, publish, distribute, sublicense, and/or
> + * sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following
> + * conditions:
> + *
> + * The above copyright notice and this permission notice shall be
> + * included in all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
> + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
> + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> */
>
> /dts-v1/;
>
^ permalink raw reply [flat|nested] 67+ messages in thread
* [PATCH 25/26] ARM: sun7i: pcduino3: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 ` [PATCH 25/26] ARM: sun7i: pcduino3: " Maxime Ripard
2014-11-04 22:46 ` Zoltan HERPAI
@ 2014-11-05 8:19 ` Maxime Ripard
1 sibling, 0 replies; 67+ messages in thread
From: Maxime Ripard @ 2014-11-05 8:19 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Oct 17, 2014 at 11:38:47AM +0200, Maxime Ripard wrote:
> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
>
> In order to make it easier for them to reuse our device trees, relicense our
> device trees under a GPL/X11 dual-license.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Zoltan HERPAI <wigyori@uid0.hu>
Applied with Zoltan's Acked-by.
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141105/0eeab7ba/attachment.sig>
^ permalink raw reply [flat|nested] 67+ messages in thread
* [PATCH 26/26] ARM: sun8i: q8h: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording Maxime Ripard
` (23 preceding siblings ...)
2014-10-17 9:38 ` [PATCH 25/26] ARM: sun7i: pcduino3: " Maxime Ripard
@ 2014-10-17 9:38 ` Maxime Ripard
2014-10-17 13:48 ` Chen-Yu Tsai
2014-10-21 17:33 ` Maxime Ripard
2014-10-17 10:30 ` [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording Nicolas Ferre
` (2 subsequent siblings)
27 siblings, 2 replies; 67+ messages in thread
From: Maxime Ripard @ 2014-10-17 9:38 UTC (permalink / raw)
To: linux-arm-kernel
The current GPL only licensing on the DTSI makes it very impractical for other
software components licensed under another license.
In order to make it easier for them to reuse our device trees, relicense our
device trees under a GPL/X11 dual-license.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Chen-Yu Tsai <wens@csie.org>
---
arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | 46 +++++++++++++++++++++++++----
1 file changed, 41 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts b/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts
index e9b8cca8dcc1..7f2117ce6985 100644
--- a/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts
+++ b/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts
@@ -3,12 +3,48 @@
*
* Chen-Yu Tsai <wens@csie.org>
*
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
+ * This file is dual-licensed: you can use it either under the terms
+ * of the GPL or the X11 license, at your option. Note that this dual
+ * licensing only applies to this file, and not this project as a
+ * whole.
*
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ *
+ * Or, alternatively,
+ *
+ * b) Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
*/
/dts-v1/;
--
2.1.1
^ permalink raw reply related [flat|nested] 67+ messages in thread* [PATCH 26/26] ARM: sun8i: q8h: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 ` [PATCH 26/26] ARM: sun8i: q8h: " Maxime Ripard
@ 2014-10-17 13:48 ` Chen-Yu Tsai
2014-10-21 17:33 ` Maxime Ripard
1 sibling, 0 replies; 67+ messages in thread
From: Chen-Yu Tsai @ 2014-10-17 13:48 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Oct 17, 2014 at 5:38 PM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
>
> In order to make it easier for them to reuse our device trees, relicense our
> device trees under a GPL/X11 dual-license.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Chen-Yu Tsai <wens@csie.org>
Acked-by: Chen-Yu Tsai <wens@csie.org>
For the series.
> ---
> arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | 46 +++++++++++++++++++++++++----
> 1 file changed, 41 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts b/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts
> index e9b8cca8dcc1..7f2117ce6985 100644
> --- a/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts
> +++ b/arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts
> @@ -3,12 +3,48 @@
> *
> * Chen-Yu Tsai <wens@csie.org>
> *
> - * The code contained herein is licensed under the GNU General Public
> - * License. You may obtain a copy of the GNU General Public License
> - * Version 2 or later at the following locations:
> + * This file is dual-licensed: you can use it either under the terms
> + * of the GPL or the X11 license, at your option. Note that this dual
> + * licensing only applies to this file, and not this project as a
> + * whole.
> *
> - * http://www.opensource.org/licenses/gpl-license.html
> - * http://www.gnu.org/copyleft/gpl.html
> + * 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.
> + *
> + * You should have received a copy of the GNU General Public
> + * License along with this file; if not, write to the Free
> + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
> + * MA 02110-1301 USA
> + *
> + * Or, alternatively,
> + *
> + * b) Permission is hereby granted, free of charge, to any person
> + * obtaining a copy of this software and associated documentation
> + * files (the "Software"), to deal in the Software without
> + * restriction, including without limitation the rights to use,
> + * copy, modify, merge, publish, distribute, sublicense, and/or
> + * sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following
> + * conditions:
> + *
> + * The above copyright notice and this permission notice shall be
> + * included in all copies or substantial portions of the Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
> + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
> + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
> + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
> + * OTHER DEALINGS IN THE SOFTWARE.
> */
>
> /dts-v1/;
> --
> 2.1.1
>
^ permalink raw reply [flat|nested] 67+ messages in thread
* [PATCH 26/26] ARM: sun8i: q8h: Relicense the device tree under GPLv2/X11
2014-10-17 9:38 ` [PATCH 26/26] ARM: sun8i: q8h: " Maxime Ripard
2014-10-17 13:48 ` Chen-Yu Tsai
@ 2014-10-21 17:33 ` Maxime Ripard
1 sibling, 0 replies; 67+ messages in thread
From: Maxime Ripard @ 2014-10-21 17:33 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Oct 17, 2014 at 11:38:48AM +0200, Maxime Ripard wrote:
> The current GPL only licensing on the DTSI makes it very impractical for other
> software components licensed under another license.
>
> In order to make it easier for them to reuse our device trees, relicense our
> device trees under a GPL/X11 dual-license.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Cc: Chen-Yu Tsai <wens@csie.org>
Applied with Chen-Yu's Acked-by
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141021/70c78997/attachment.sig>
^ permalink raw reply [flat|nested] 67+ messages in thread
* [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording
2014-10-17 9:38 [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording Maxime Ripard
` (24 preceding siblings ...)
2014-10-17 9:38 ` [PATCH 26/26] ARM: sun8i: q8h: " Maxime Ripard
@ 2014-10-17 10:30 ` Nicolas Ferre
2014-10-27 22:02 ` Maxime Ripard
2014-10-27 22:05 ` Maxime Ripard
27 siblings, 0 replies; 67+ messages in thread
From: Nicolas Ferre @ 2014-10-17 10:30 UTC (permalink / raw)
To: linux-arm-kernel
On 17/10/2014 11:38, Maxime Ripard :
> During the GPL to GPL/X11 licensing migration, the GPL notice introduced
> mentionned the device trees as a library, which is not really accurate. It
> began to spread by copy and paste. Fix all these library mentions to reflect
> the file that it's actually just a file.
OMG, we have the same thing to do on our recently added .dts file
(7a4752677c449efa4a545014d5a153c409744d9f).
Bye,
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
> arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 6 +++---
> arch/arm/boot/dts/sun6i-a31.dtsi | 6 +++---
> arch/arm/boot/dts/sun7i-a20-bananapi.dts | 6 +++---
> arch/arm/boot/dts/sun7i-a20-m3.dts | 6 +++---
> arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 6 +++---
> arch/arm/boot/dts/sun7i-a20.dtsi | 6 +++---
> arch/arm/boot/dts/sun8i-a23.dtsi | 6 +++---
> arch/arm/boot/dts/sun9i-a80-optimus.dts | 6 +++---
> arch/arm/boot/dts/sun9i-a80.dtsi | 6 +++---
> 9 files changed, 27 insertions(+), 27 deletions(-)
>
> diff --git a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
> index 8b3cd0907b32..eeed1f236ee8 100644
> --- a/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
> +++ b/arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
> @@ -6,18 +6,18 @@
> * licensing only applies to this file, and not this project as a
> * whole.
> *
> - * a) This library is free software; you can redistribute it and/or
> + * 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 library is distributed in the hope that it will be useful,
> + * 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.
> *
> * You should have received a copy of the GNU General Public
> - * License along with this library; if not, write to the Free
> + * License along with this file; if not, write to the Free
> * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
> * MA 02110-1301 USA
> *
> diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
> index 543f895d18d3..e80288e881ec 100644
> --- a/arch/arm/boot/dts/sun6i-a31.dtsi
> +++ b/arch/arm/boot/dts/sun6i-a31.dtsi
> @@ -8,18 +8,18 @@
> * licensing only applies to this file, and not this project as a
> * whole.
> *
> - * a) This library is free software; you can redistribute it and/or
> + * 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 library is distributed in the hope that it will be useful,
> + * 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.
> *
> * You should have received a copy of the GNU General Public
> - * License along with this library; if not, write to the Free
> + * License along with this file; if not, write to the Free
> * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
> * MA 02110-1301 USA
> *
> diff --git a/arch/arm/boot/dts/sun7i-a20-bananapi.dts b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
> index 0e7c9f552b58..3de847db7e76 100644
> --- a/arch/arm/boot/dts/sun7i-a20-bananapi.dts
> +++ b/arch/arm/boot/dts/sun7i-a20-bananapi.dts
> @@ -8,18 +8,18 @@
> * licensing only applies to this file, and not this project as a
> * whole.
> *
> - * a) This library is free software; you can redistribute it and/or
> + * 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 library is distributed in the hope that it will be useful,
> + * 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.
> *
> * You should have received a copy of the GNU General Public
> - * License along with this library; if not, write to the Free
> + * License along with this file; if not, write to the Free
> * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
> * MA 02110-1301 USA
> *
> diff --git a/arch/arm/boot/dts/sun7i-a20-m3.dts b/arch/arm/boot/dts/sun7i-a20-m3.dts
> index ce071417e029..b8e568c55271 100644
> --- a/arch/arm/boot/dts/sun7i-a20-m3.dts
> +++ b/arch/arm/boot/dts/sun7i-a20-m3.dts
> @@ -8,18 +8,18 @@
> * licensing only applies to this file, and not this project as a
> * whole.
> *
> - * a) This library is free software; you can redistribute it and/or
> + * 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 library is distributed in the hope that it will be useful,
> + * 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.
> *
> * You should have received a copy of the GNU General Public
> - * License along with this library; if not, write to the Free
> + * License along with this file; if not, write to the Free
> * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
> * MA 02110-1301 USA
> *
> diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
> index 187729a0b7d8..ed364d5e755e 100644
> --- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
> +++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
> @@ -6,18 +6,18 @@
> * licensing only applies to this file, and not this project as a
> * whole.
> *
> - * a) This library is free software; you can redistribute it and/or
> + * 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 library is distributed in the hope that it will be useful,
> + * 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.
> *
> * You should have received a copy of the GNU General Public
> - * License along with this library; if not, write to the Free
> + * License along with this file; if not, write to the Free
> * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
> * MA 02110-1301 USA
> *
> diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
> index f0a75c6523a1..45bb9162f5c7 100644
> --- a/arch/arm/boot/dts/sun7i-a20.dtsi
> +++ b/arch/arm/boot/dts/sun7i-a20.dtsi
> @@ -8,18 +8,18 @@
> * licensing only applies to this file, and not this project as a
> * whole.
> *
> - * a) This library is free software; you can redistribute it and/or
> + * 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 library is distributed in the hope that it will be useful,
> + * 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.
> *
> * You should have received a copy of the GNU General Public
> - * License along with this library; if not, write to the Free
> + * License along with this file; if not, write to the Free
> * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
> * MA 02110-1301 USA
> *
> diff --git a/arch/arm/boot/dts/sun8i-a23.dtsi b/arch/arm/boot/dts/sun8i-a23.dtsi
> index 6146ef15efbe..6086adbf9d74 100644
> --- a/arch/arm/boot/dts/sun8i-a23.dtsi
> +++ b/arch/arm/boot/dts/sun8i-a23.dtsi
> @@ -8,18 +8,18 @@
> * licensing only applies to this file, and not this project as a
> * whole.
> *
> - * a) This library is free software; you can redistribute it and/or
> + * 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 library is distributed in the hope that it will be useful,
> + * 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.
> *
> * You should have received a copy of the GNU General Public
> - * License along with this library; if not, write to the Free
> + * License along with this file; if not, write to the Free
> * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
> * MA 02110-1301 USA
> *
> diff --git a/arch/arm/boot/dts/sun9i-a80-optimus.dts b/arch/arm/boot/dts/sun9i-a80-optimus.dts
> index f83abab108b9..3a70fdf8877e 100644
> --- a/arch/arm/boot/dts/sun9i-a80-optimus.dts
> +++ b/arch/arm/boot/dts/sun9i-a80-optimus.dts
> @@ -8,18 +8,18 @@
> * licensing only applies to this file, and not this project as a
> * whole.
> *
> - * a) This library is free software; you can redistribute it and/or
> + * 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 library is distributed in the hope that it will be useful,
> + * 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.
> *
> * You should have received a copy of the GNU General Public
> - * License along with this library; if not, write to the Free
> + * License along with this file; if not, write to the Free
> * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
> * MA 02110-1301 USA
> *
> diff --git a/arch/arm/boot/dts/sun9i-a80.dtsi b/arch/arm/boot/dts/sun9i-a80.dtsi
> index 5e2ec4b71f5b..ae0920f7ce7a 100644
> --- a/arch/arm/boot/dts/sun9i-a80.dtsi
> +++ b/arch/arm/boot/dts/sun9i-a80.dtsi
> @@ -8,18 +8,18 @@
> * licensing only applies to this file, and not this project as a
> * whole.
> *
> - * a) This library is free software; you can redistribute it and/or
> + * 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 library is distributed in the hope that it will be useful,
> + * 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.
> *
> * You should have received a copy of the GNU General Public
> - * License along with this library; if not, write to the Free
> + * License along with this file; if not, write to the Free
> * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
> * MA 02110-1301 USA
> *
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 67+ messages in thread* [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording
2014-10-17 9:38 [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording Maxime Ripard
` (25 preceding siblings ...)
2014-10-17 10:30 ` [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording Nicolas Ferre
@ 2014-10-27 22:02 ` Maxime Ripard
2014-10-27 22:46 ` Roman Byshko
` (2 more replies)
2014-10-27 22:05 ` Maxime Ripard
27 siblings, 3 replies; 67+ messages in thread
From: Maxime Ripard @ 2014-10-27 22:02 UTC (permalink / raw)
To: linux-arm-kernel
Hi everyone,
This should have been in a cover letter, but I somehow forgot to send
one...
So here it is.
You've been Cc'd on a relicensing patch, because at some point you
contributed a patch to an Allwinner device tree.
We're currently moving toward a GPL/X11 dual-license, instead of a GPL
license like what was done when you submitted your patches.
This is mostly so that other free software project licensed under a
BSD-like license, such as the BSD systems, can actually use our DT,
instead of having to rewrite them on their own.
Such license changes require the agreement of all the contributors, so
it would be great, if you agree with the new licensing terms of
course, that you reply to the patch by giving your acked-by.
Thanks a lot,
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141027/cb001d19/attachment-0001.sig>
^ permalink raw reply [flat|nested] 67+ messages in thread* [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording
2014-10-27 22:02 ` Maxime Ripard
@ 2014-10-27 22:46 ` Roman Byshko
2014-11-07 5:52 ` Olof Johansson
2014-11-07 13:13 ` Maxime Ripard
2 siblings, 0 replies; 67+ messages in thread
From: Roman Byshko @ 2014-10-27 22:46 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Oct 27, 2014 at 11:02 PM, Maxime Ripard
<maxime.ripard@free-electrons.com> wrote:
> Hi everyone,
>
> This should have been in a cover letter, but I somehow forgot to send
> one...
>
> So here it is.
>
> You've been Cc'd on a relicensing patch, because at some point you
> contributed a patch to an Allwinner device tree.
>
> We're currently moving toward a GPL/X11 dual-license, instead of a GPL
> license like what was done when you submitted your patches.
>
> This is mostly so that other free software project licensed under a
> BSD-like license, such as the BSD systems, can actually use our DT,
> instead of having to rewrite them on their own.
>
> Such license changes require the agreement of all the contributors, so
> it would be great, if you agree with the new licensing terms of
> course, that you reply to the patch by giving your acked-by.
Acked-By: Roman Byshko <rbyshko@gmail.com>
> Thanks a lot,
> Maxime
>
> --
> Maxime Ripard, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com
^ permalink raw reply [flat|nested] 67+ messages in thread
* [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording
2014-10-27 22:02 ` Maxime Ripard
2014-10-27 22:46 ` Roman Byshko
@ 2014-11-07 5:52 ` Olof Johansson
2014-11-07 13:13 ` Maxime Ripard
2 siblings, 0 replies; 67+ messages in thread
From: Olof Johansson @ 2014-11-07 5:52 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Oct 27, 2014 at 11:02:51PM +0100, Maxime Ripard wrote:
> Hi everyone,
>
> This should have been in a cover letter, but I somehow forgot to send
> one...
>
> So here it is.
>
> You've been Cc'd on a relicensing patch, because at some point you
> contributed a patch to an Allwinner device tree.
>
> We're currently moving toward a GPL/X11 dual-license, instead of a GPL
> license like what was done when you submitted your patches.
>
> This is mostly so that other free software project licensed under a
> BSD-like license, such as the BSD systems, can actually use our DT,
> instead of having to rewrite them on their own.
>
> Such license changes require the agreement of all the contributors, so
> it would be great, if you agree with the new licensing terms of
> course, that you reply to the patch by giving your acked-by.
I'm definitely fine with relicensing of any of the pieces I have done, so:
Acked-by: Olof Johansson <olof@lixom.net>
-Olof
^ permalink raw reply [flat|nested] 67+ messages in thread
* [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording
2014-10-27 22:02 ` Maxime Ripard
2014-10-27 22:46 ` Roman Byshko
2014-11-07 5:52 ` Olof Johansson
@ 2014-11-07 13:13 ` Maxime Ripard
2 siblings, 0 replies; 67+ messages in thread
From: Maxime Ripard @ 2014-11-07 13:13 UTC (permalink / raw)
To: linux-arm-kernel
Hi Alexander, Wills, Zalan,
I need your approval on this one.
On Mon, Oct 27, 2014 at 11:02:51PM +0100, Maxime Ripard wrote:
> Hi everyone,
>
> This should have been in a cover letter, but I somehow forgot to send
> one...
>
> So here it is.
>
> You've been Cc'd on a relicensing patch, because at some point you
> contributed a patch to an Allwinner device tree.
>
> We're currently moving toward a GPL/X11 dual-license, instead of a GPL
> license like what was done when you submitted your patches.
>
> This is mostly so that other free software project licensed under a
> BSD-like license, such as the BSD systems, can actually use our DT,
> instead of having to rewrite them on their own.
>
> Such license changes require the agreement of all the contributors, so
> it would be great, if you agree with the new licensing terms of
> course, that you reply to the patch by giving your acked-by.
>
> Thanks a lot,
> Maxime
>
> --
> Maxime Ripard, Free Electrons
> Embedded Linux, Kernel and Android engineering
> http://free-electrons.com
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141107/fe177507/attachment.sig>
^ permalink raw reply [flat|nested] 67+ messages in thread
* [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording
2014-10-17 9:38 [PATCH 01/26] ARM: sunxi: Fix GPLv2 wording Maxime Ripard
` (26 preceding siblings ...)
2014-10-27 22:02 ` Maxime Ripard
@ 2014-10-27 22:05 ` Maxime Ripard
27 siblings, 0 replies; 67+ messages in thread
From: Maxime Ripard @ 2014-10-27 22:05 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Oct 17, 2014 at 11:38:23AM +0200, Maxime Ripard wrote:
> During the GPL to GPL/X11 licensing migration, the GPL notice introduced
> mentionned the device trees as a library, which is not really accurate. It
> began to spread by copy and paste. Fix all these library mentions to reflect
> the file that it's actually just a file.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Applied.
Maxime
--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141027/858761af/attachment.sig>
^ permalink raw reply [flat|nested] 67+ messages in thread