[PATCH 08/27] ARM: mvebu: armada-370-xp: Relicense the device tree under GPLv2+/X11

[Simon Guinot]

On Tue, Dec 16, 2014 at 12:22:21AM +0100, Simon Guinot wrote:
> On Mon, Dec 15, 2014 at 04:38:16PM +0100, Gregory CLEMENT wrote:
> > The current GPL only licensing on the device tree 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.
> > 
> > Cc: Andrew Lunn <andrew at lunn.ch>
> > Cc: Arnaud Ebalard <arno at natisbad.org>
> > Cc: Ezequiel Garcia <ezequiel.garcia at free-electrons.com>
> > Cc: Greg Ungerer <gerg at uclinux.org>
> > Cc: Heikki Krogerus <heikki.krogerus at linux.intel.com>
> > Cc: Jason Cooper <jason at lakedaemon.net>
> > Cc: Lorenzo Pieralisi <lorenzo.pieralisi at arm.com>
> > Cc: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
> > Cc: Simon Baatz <gmbnomis at gmail.com>
> > Cc: Simon Guinot <simon.guinot at sequanux.org>
> > Cc: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
> > Cc: Willy Tarreau <w at 1wt.eu>
> > Signed-off-by: Gregory CLEMENT <gregory.clement at free-electrons.com>
> > ---
> >  arch/arm/boot/dts/armada-370-xp.dtsi | 40 +++++++++++++++++++++++++++++++++---
> >  1 file changed, 37 insertions(+), 3 deletions(-)
> 
> Hi Gregory,
> 
> NAK for me.

After some thoughts I changed my mind about this. I can't see no point
in forcing people to rewrite a commit for a single line which is even
not covered by my copyright...

Then, for the armada-370-xp.dtsi file:

Acked-by: Simon Guinot <simon.guinot at sequanux.org>

Simon

> > 
> > diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
> > index 1af428602748..8a322ad57e5f 100644
> > --- a/arch/arm/boot/dts/armada-370-xp.dtsi
> > +++ b/arch/arm/boot/dts/armada-370-xp.dtsi
> > @@ -8,9 +8,43 @@
> >   * Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
> >   * Ben Dooks <ben.dooks at codethink.co.uk>
> >   *
> > - * This file is licensed under the terms of the GNU General Public
> > - * License version 2.  This program is licensed "as is" without any
> > - * warranty of any kind, whether express or implied.
> > + * 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.
> > + *
> > + *  a) This file is free software; you can redistribute it and/or
> > + *     modify it under the terms of the GNU General Public License as
> > + *     published by the Free Software Foundation; either version 2 of the
> > + *     License, or (at your option) any later version.
> > + *
> > + *     This file is distributed in the hope that it will be useful
> > + *     but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> > + *     GNU General Public License for more details.
> > + *
> > + * Or, alternatively
> > + *
> > + *  b) Permission is 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 , 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.
> >   *
> >   * This file contains the definitions that are common to the Armada
> >   * 370 and Armada XP SoC.
> > -- 
> > 1.9.1



> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141218/15d43a2f/attachment.sig>