From mboxrd@z Thu Jan 1 00:00:00 1970 From: gerg@uclinux.org (Greg Ungerer) Date: Tue, 16 Dec 2014 10:20:40 +1000 Subject: [PATCH 08/27] ARM: mvebu: armada-370-xp: Relicense the device tree under GPLv2+/X11 In-Reply-To: <1418657915-22775-9-git-send-email-gregory.clement@free-electrons.com> References: <1418657915-22775-1-git-send-email-gregory.clement@free-electrons.com> <1418657915-22775-9-git-send-email-gregory.clement@free-electrons.com> Message-ID: <548F7AD8.7050903@uclinux.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Gregory, On 16/12/14 01:38, 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 > Cc: Arnaud Ebalard > Cc: Ezequiel Garcia > Cc: Greg Ungerer I am fine with this. Acked-by: Greg Ungerer Regards Greg > Cc: Heikki Krogerus > Cc: Jason Cooper > Cc: Lorenzo Pieralisi > Cc: Nobuhiro Iwamatsu > Cc: Simon Baatz > Cc: Simon Guinot > Cc: Thomas Petazzoni > Cc: Willy Tarreau > Signed-off-by: Gregory CLEMENT > --- > arch/arm/boot/dts/armada-370-xp.dtsi | 40 +++++++++++++++++++++++++++++++++--- > 1 file changed, 37 insertions(+), 3 deletions(-) > > 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 > * Ben Dooks > * > - * 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. >