From mboxrd@z Thu Jan 1 00:00:00 1970 From: zyw@rock-chips.com (Chris Zhong) Date: Fri, 15 May 2015 09:21:59 +0800 Subject: [PATCH 4/8] ARM: dts: rockchip: relicense rk3288.dtsi under GPLv2/X11 In-Reply-To: <1425665046-22927-5-git-send-email-heiko@sntech.de> References: <1425665046-22927-1-git-send-email-heiko@sntech.de> <1425665046-22927-5-git-send-email-heiko@sntech.de> Message-ID: <55554A37.6060800@rock-chips.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Acked-by: Chris Zhong On 03/07/2015 02:04 AM, Heiko Stuebner 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 rk3288.dtsi to this combination. > > CCs were aquired by git shortlog -sne so it should've hopefully catched > every contributor. > > Signed-off-by: Heiko Stuebner > Cc: Kever Yang > Cc: Doug Anderson > Cc: Addy Ke > Cc: Daniel Kurtz > Cc: Andy Yan > Cc: Caesar Wang > Cc: Chris Zhong > Cc: Daniel Lezcano > Cc: Jianqun Xu > Cc: Roger Chen > Cc: Sonny Rao > Cc: Yunzhi Li > Cc: huang lin > > Not sure if an Ack for a simple revert is necessary, but included anyway > Cc: Olof Johansson > --- > I'm hoping to get Acked-by tags from the people in the Cc-list. > > arch/arm/boot/dts/rk3288.dtsi | 44 +++++++++++++++++++++++++++++++++++-------- > 1 file changed, 36 insertions(+), 8 deletions(-) > > diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi > index 2c29a3e..35a06a5 100644 > --- a/arch/arm/boot/dts/rk3288.dtsi > +++ b/arch/arm/boot/dts/rk3288.dtsi > @@ -1,13 +1,41 @@ > /* > - * 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. > * > - * This program 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. > + * 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 "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. > */ > > #include