Thread (15 messages) 15 messages, 5 authors, 2020-02-28

Re: [PATCH v1 2/5] arm: dts: imx7: toradex: use SPDX-License-Identifier

From: Marcel Ziswiler <hidden>
Date: 2020-02-28 16:50:09
Also in: linux-devicetree, lkml

Hi Igor

On Mon, 2020-02-24 at 19:32 +0200, Igor Opaniuk wrote:
quoted hunk ↗ jump to hunk
From: Igor Opaniuk <redacted>

1. Replace boiler plate licenses texts with the SPDX license
identifiers in Toradex i.MX7-based SoM device trees.
2. As X11 is identical to the MIT License, but with an extra sentence
that prohibits using the copyright holders' names for advertising or
promotional purposes without written permission, use MIT license
instead
of X11 ('s/X11/MIT/g').

Signed-off-by: Igor Opaniuk <redacted>
---

 arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 41 ++-----------------
----------
 arch/arm/boot/dts/imx7-colibri.dtsi         | 41 ++-----------------
----------
 arch/arm/boot/dts/imx7d-colibri-eval-v3.dts | 41 ++-----------------
----------
 arch/arm/boot/dts/imx7d-colibri.dtsi        | 41 ++-----------------
----------
 arch/arm/boot/dts/imx7s-colibri-eval-v3.dts | 41 ++-----------------
----------
 arch/arm/boot/dts/imx7s-colibri.dtsi        | 41 ++-----------------
----------
 6 files changed, 12 insertions(+), 234 deletions(-)
diff --git a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
index 6aa123c..0ec2b81 100644
--- a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
+++ b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi
@@ -1,43 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0+ OR MIT
 /*
- * Copyright 2016 Toradex AG
- *
- * 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.
+ * Copyright 2016-2020 Toradex AG
Just drop the AG here and in all other files.

Thanks!

Cheers

Marcel
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help