| Message ID | 1448323291-23505-1-git-send-email-stefan@agner.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Nov 23, 2015 at 04:01:31PM -0800, Stefan Agner wrote: > GPLv2-only devicetrees make reuse difficult for software components > licensed under a different license. > > The consensus is that a GPL/X11 dual-license should allow all necessary > uses, so relicense the vf610-twr.dts file to this combination. > > CCs were acquired using (updated some email addresses): > git shortlog -sne --no-merges arch/arm/boot/dts/vf610-cosmic.dts > > CC: Cory Tusar <cory.tusar@pid1solutions.com> > CC: Matt Porter <matt.porter@linaro.org> > CC: Olof Johansson <olof@lixom.net> > CC: Shawn Guo <shawnguo@kernel.org> Acked-by: Shawn Guo <shawnguo@kernel.org> > Signed-off-by: Stefan Agner <stefan@agner.ch>
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 11/23/2015 07:01 PM, Stefan Agner wrote: > GPLv2-only devicetrees make reuse difficult for software components > licensed under a different license. > > The consensus is that a GPL/X11 dual-license should allow all necessary > uses, so relicense the vf610-twr.dts file to this combination. > > CCs were acquired using (updated some email addresses): > git shortlog -sne --no-merges arch/arm/boot/dts/vf610-cosmic.dts > > CC: Cory Tusar <cory.tusar@pid1solutions.com> Acked-by: Cory Tusar <cory.tusar@pid1solutions.com> > CC: Matt Porter <matt.porter@linaro.org> > CC: Olof Johansson <olof@lixom.net> > CC: Shawn Guo <shawnguo@kernel.org> > Signed-off-by: Stefan Agner <stefan@agner.ch> - -- Cory Tusar Principal PID 1 Solutions, Inc. "There are two ways of constructing a software design. One way is to make it so simple that there are obviously no deficiencies, and the other way is to make it so complicated that there are no obvious deficiencies." --Sir Charles Anthony Richard Hoare -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEARECAAYFAlZVSgIACgkQHT1tsfGwHJ8+WgCgpIksiDYnrAinLzsEv11cl5Ez Hb4An1Bm9qpykikhgs+BDjuNiDp7KDC/ =8817 -----END PGP SIGNATURE-----
diff --git a/arch/arm/boot/dts/vf610-cosmic.dts b/arch/arm/boot/dts/vf610-cosmic.dts index 5447f25..d0559c1 100644 --- a/arch/arm/boot/dts/vf610-cosmic.dts +++ b/arch/arm/boot/dts/vf610-cosmic.dts @@ -2,10 +2,42 @@ * Copyright 2013 Freescale Semiconductor, Inc. * Copyright 2013 Linaro Limited * - * This program 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 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 + * version 2 as published by the Free Software Foundation. + * + * 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. */ /dts-v1/;
GPLv2-only devicetrees make reuse difficult for software components licensed under a different license. The consensus is that a GPL/X11 dual-license should allow all necessary uses, so relicense the vf610-twr.dts file to this combination. CCs were acquired using (updated some email addresses): git shortlog -sne --no-merges arch/arm/boot/dts/vf610-cosmic.dts CC: Cory Tusar <cory.tusar@pid1solutions.com> CC: Matt Porter <matt.porter@linaro.org> CC: Olof Johansson <olof@lixom.net> CC: Shawn Guo <shawnguo@kernel.org> Signed-off-by: Stefan Agner <stefan@agner.ch> --- arch/arm/boot/dts/vf610-cosmic.dts | 40 ++++++++++++++++++++++++++++++++++---- 1 file changed, 36 insertions(+), 4 deletions(-)