lkml.org 
[lkml]   [2019]   [Dec]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH v2 2/3] arm64: dts: allwinner: Convert license to SPDX identifier
Hi Maxime,

On Tue, 10 Dec 2019 at 10:38, Maxime Ripard <mripard@kernel.org> wrote:
>
> Hi Clément,
>
> On Mon, Dec 09, 2019 at 07:20:23PM +0100, Clément Péron wrote:
> > Use a shorter SPDX identifier instead of pasting the
> > whole license.
> >
> > Signed-off-by: Clément Péron <peron.clem@gmail.com>
> > ---
> > arch/arm64/boot/dts/allwinner/axp803.dtsi | 39 +------------------
> > .../dts/allwinner/sun50i-a64-bananapi-m64.dts | 39 +------------------
> > .../dts/allwinner/sun50i-a64-nanopi-a64.dts | 39 +------------------
> > .../dts/allwinner/sun50i-a64-olinuxino.dts | 39 +------------------
> > .../dts/allwinner/sun50i-a64-orangepi-win.dts | 39 +------------------
> > .../dts/allwinner/sun50i-a64-pine64-plus.dts | 39 +------------------
> > .../boot/dts/allwinner/sun50i-a64-pine64.dts | 39 +------------------
> > .../allwinner/sun50i-a64-sopine-baseboard.dts | 39 +------------------
> > .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 39 +------------------
> > arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 39 +------------------
> > .../allwinner/sun50i-h5-nanopi-neo-plus2.dts | 39 +------------------
> > .../dts/allwinner/sun50i-h5-nanopi-neo2.dts | 39 +------------------
> > .../dts/allwinner/sun50i-h5-orangepi-pc2.dts | 39 +------------------
> > .../allwinner/sun50i-h5-orangepi-prime.dts | 39 +------------------
> > .../sun50i-h5-orangepi-zero-plus2.dts | 39 +------------------
> > arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 39 +------------------
> > 16 files changed, 16 insertions(+), 608 deletions(-)
> >
> > diff --git a/arch/arm64/boot/dts/allwinner/axp803.dtsi b/arch/arm64/boot/dts/allwinner/axp803.dtsi
> > index f0349ef4bfdd..0e13e75132ac 100644
> > --- a/arch/arm64/boot/dts/allwinner/axp803.dtsi
> > +++ b/arch/arm64/boot/dts/allwinner/axp803.dtsi
> > @@ -1,43 +1,6 @@
> > +// SPDX-License-Identifier: (GPL-2.0+ OR X11)
> > /*
> > * Copyright 2017 Icenowy Zheng <icenowy@aosc.xyz>
> > - *
> > - * 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 "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.
> > */
>
> Thanks for sending a new iteration of this. I had a look at the
> licenses texts associated to the SPDX tag in the LICENSES folder, and
> it turns out that the tag we should be using for that text is
> MIT. While we mention X11 in the header, the text associated to the
> X11 license isn't the one we have in our headers.

Yes you're right text associated is the MIT License.

>
> I guess we should make very clear in the commit log that even though
> the tag now reports MIT, this maps to the same license text and is not
> therefore a license change.

Ok I will add this to the commit log

Regards,
Clément
>
> Thanks!
> Maxime

\
 
 \ /
  Last update: 2019-12-10 16:04    [W:0.038 / U:8.816 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site