| Message ID | 20190520143812.2801-9-narmstrong@baylibre.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | ARM: meson: update with SPDX Licence identifier | expand |
Hi Neil, On Mon, May 20, 2019 at 4:39 PM Neil Armstrong <narmstrong@baylibre.com> wrote: > > Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> > --- > arch/arm/boot/dts/meson8b.dtsi | 42 +--------------------------------- > 1 file changed, 1 insertion(+), 41 deletions(-) > > diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi > index 800cd65fc50a..c38b0828b7ec 100644 > --- a/arch/arm/boot/dts/meson8b.dtsi > +++ b/arch/arm/boot/dts/meson8b.dtsi > @@ -1,47 +1,7 @@ > +// SPDX-License-Identifier: GPL-2.0 OR X11 the GPL text below states "either version 2 of the License, or (at your option) any later version" so I believe this should be GPL-2.0+ the second license text matches the MIT license [0] better than the X11 license [1] due to the phrase "THE AUTHORS OR COPYRIGHT" (while X11 uses "THE X CONSORTIUM") Martin [0] https://spdx.org/licenses/MIT.html [1] https://spdx.org/licenses/X11.html
Martin Blumenstingl <martin.blumenstingl@googlemail.com> writes: > Hi Neil, > > On Mon, May 20, 2019 at 4:39 PM Neil Armstrong <narmstrong@baylibre.com> wrote: >> >> Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> >> --- >> arch/arm/boot/dts/meson8b.dtsi | 42 +--------------------------------- >> 1 file changed, 1 insertion(+), 41 deletions(-) >> >> diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi >> index 800cd65fc50a..c38b0828b7ec 100644 >> --- a/arch/arm/boot/dts/meson8b.dtsi >> +++ b/arch/arm/boot/dts/meson8b.dtsi >> @@ -1,47 +1,7 @@ >> +// SPDX-License-Identifier: GPL-2.0 OR X11 > > the GPL text below states "either version 2 of the License, or (at > your option) any later version" so I believe this should be GPL-2.0+ The "at your option" here is key. IMO, we should stick to the more common kernel practice of GPL-2.0 unless the original author (Carlo now Cc'd) wants to make it GPL-2.0+ Kevin
diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi index 800cd65fc50a..c38b0828b7ec 100644 --- a/arch/arm/boot/dts/meson8b.dtsi +++ b/arch/arm/boot/dts/meson8b.dtsi @@ -1,47 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0 OR X11 /* * Copyright 2015 Endless Mobile, Inc. * Author: Carlo Caione <carlo@endlessm.com> - * - * 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 library 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 library 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. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - * 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 <dt-bindings/clock/meson8b-clkc.h>
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com> --- arch/arm/boot/dts/meson8b.dtsi | 42 +--------------------------------- 1 file changed, 1 insertion(+), 41 deletions(-)