From: gregory.clement@bootlin.com (Gregory CLEMENT)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 09/36] arm: dts: armada-370-netgear-rn*: use SPDX-License-Identifier
Date: Thu, 15 Mar 2018 16:06:50 +0100 [thread overview]
Message-ID: <20180315150717.10588-10-gregory.clement@bootlin.com> (raw)
In-Reply-To: <20180315150717.10588-1-gregory.clement@bootlin.com>
Follow the recent trend for the license description, and also fix the
wrongly stated X11 to MIT.
As already pointed on the DT ML, the X11 license text [1] is explicitly
for the X Consortium and has a couple of extra clauses. The MIT
license text [2] is actually what the current DT files claim.
[1] https://spdx.org/licenses/X11.html
[2] https://spdx.org/licenses/MIT.html
Cc: Arnaud Ebalard <arno@natisbad.org>
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
---
arch/arm/boot/dts/armada-370-netgear-rn102.dts | 39 +-------------------------
arch/arm/boot/dts/armada-370-netgear-rn104.dts | 39 +-------------------------
2 files changed, 2 insertions(+), 76 deletions(-)
diff --git a/arch/arm/boot/dts/armada-370-netgear-rn102.dts b/arch/arm/boot/dts/armada-370-netgear-rn102.dts
index d2225bd4a76f..56634803e16b 100644
--- a/arch/arm/boot/dts/armada-370-netgear-rn102.dts
+++ b/arch/arm/boot/dts/armada-370-netgear-rn102.dts
@@ -1,45 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Device Tree file for NETGEAR ReadyNAS 102
*
* Copyright (C) 2013, Arnaud EBALARD <arno@natisbad.org>
- *
- * 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.
*/
/dts-v1/;
diff --git a/arch/arm/boot/dts/armada-370-netgear-rn104.dts b/arch/arm/boot/dts/armada-370-netgear-rn104.dts
index b73cae836bc1..16d0307f786a 100644
--- a/arch/arm/boot/dts/armada-370-netgear-rn104.dts
+++ b/arch/arm/boot/dts/armada-370-netgear-rn104.dts
@@ -1,45 +1,8 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
/*
* Device Tree file for NETGEAR ReadyNAS 104
*
* Copyright (C) 2013, Arnaud EBALARD <arno@natisbad.org>
- *
- * 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.
*/
/dts-v1/;
--
2.16.1
next prev parent reply other threads:[~2018-03-15 15:06 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-15 15:06 [PATCH 00/36] use SPDX-License-Identifier for 32 bits Armada SoCs and boards Gregory CLEMENT
2018-03-15 15:06 ` [PATCH 01/36] arm: dts: armada-370-xp: use SPDX-License-Identifier for Armada 370/XP SoCs Gregory CLEMENT
2018-03-15 15:06 ` [PATCH 02/36] arm: dts: armada-375: use SPDX-License-Identifier for Armada 375 SoCs Gregory CLEMENT
2018-03-15 15:06 ` [PATCH 03/36] arm: dts: armada-38x: use SPDX-License-Identifier for Armada 38x SoCs Gregory CLEMENT
2018-03-15 15:06 ` [PATCH 04/36] arm: dts: armada-39x: use SPDX-License-Identifier for Armada 39x SoCs Gregory CLEMENT
2018-03-15 15:06 ` [PATCH 05/36] arm: dts: armada-xp-98dx: use SPDX-License-Identifier for prestara 98d SoCs Gregory CLEMENT
2018-03-15 20:24 ` Chris Packham
2018-03-15 15:06 ` [PATCH 06/36] arm: dts: armada-370-db: use SPDX-License-Identifier Gregory CLEMENT
2018-03-15 15:06 ` [PATCH 07/36] arm: dts: armada-370-dlink-dns327l: " Gregory CLEMENT
2018-03-15 15:06 ` [PATCH 08/36] arm: dts: armada-370-mirabox: " Gregory CLEMENT
2018-03-15 15:06 ` Gregory CLEMENT [this message]
2018-03-15 15:06 ` [PATCH 10/36] arm: dts: armada-370-rd: " Gregory CLEMENT
2018-03-15 21:21 ` Florian Fainelli
2018-03-15 15:06 ` [PATCH 11/36] arm: dts: armada-370-synology-ds213j: " Gregory CLEMENT
2018-03-15 15:06 ` [PATCH 12/36] arm: dts: armada-375-db: " Gregory CLEMENT
2018-03-15 15:06 ` [PATCH 13/36] arm: dts: armada-388-db: " Gregory CLEMENT
2018-03-15 15:06 ` [PATCH 14/36] arm: dts: armada-388-rd: " Gregory CLEMENT
2018-03-15 15:06 ` [PATCH 15/36] arm: dts: armada-390-db: " Gregory CLEMENT
2018-03-15 15:06 ` [PATCH 16/36] arm: dts: armada-398-db: " Gregory CLEMENT
2018-03-15 15:06 ` [PATCH 17/36] arm: dts: armada-xp-axpwifiap: " Gregory CLEMENT
2018-03-15 15:06 ` [PATCH 18/36] arm: dts: armada-xp-db-dxbc2: " Gregory CLEMENT
2018-03-15 15:07 ` [PATCH 19/36] arm: dts: armada-xp-db-xc3-24g4xg: " Gregory CLEMENT
2018-03-15 15:07 ` [PATCH 20/36] arm: dts: armada-xp-db: " Gregory CLEMENT
2018-03-15 15:07 ` [PATCH 21/36] arm: dts: armada-xp-gp: " Gregory CLEMENT
2018-03-15 15:07 ` [PATCH 22/36] arm: dts: armada-xp-lenovo-ix4-300d: " Gregory CLEMENT
2018-03-15 15:07 ` [PATCH 23/36] arm: dts: armada-xp-matrix: " Gregory CLEMENT
2018-03-15 15:07 ` [PATCH 24/36] arm: dts: armada-xp-netgear-rn2120: " Gregory CLEMENT
2018-03-15 15:07 ` [PATCH 25/36] arm: dts: armada-xp-openblocks-ax3-4: " Gregory CLEMENT
2018-03-15 15:07 ` [PATCH 26/36] arm: dts: armada-xp-synology-ds414: " Gregory CLEMENT
2018-03-15 15:07 ` [PATCH 27/36] arm: dts: armada-385-db-ap: " Gregory CLEMENT
2018-03-16 6:43 ` Maxime Ripard
2018-03-15 15:07 ` [PATCH 28/36] arm: dts: armada-385-linksys*: use SPDX-License-Identifier for Linksys boards Gregory CLEMENT
2018-03-15 15:07 ` [PATCH 29/36] arm: dts: armada-385-synology-ds116: use SPDX-License-Identifier Gregory CLEMENT
2018-03-15 15:07 ` [PATCH 30/36] arm: dts: armada-385-turris-omnia: " Gregory CLEMENT
2018-03-15 21:18 ` Uwe Kleine-König
2018-03-15 15:07 ` [PATCH 31/36] arm: dts: armada-388-clearfog*: use SPDX-License-Identifier for clearfog and microsom Gregory CLEMENT
2018-03-15 15:07 ` [PATCH 32/36] arm: dts: armada-388-gp: use SPDX-License-Identifier Gregory CLEMENT
2018-03-15 15:07 ` [PATCH 33/36] arm: dts: armada-395-gp: " Gregory CLEMENT
2018-03-15 15:07 ` [PATCH 34/36] arm: dts: armada-xp-linksys-mamba: " Gregory CLEMENT
2018-03-15 15:07 ` [PATCH 35/36] arm: dts: armada-370-seagate-nas-*: " Gregory CLEMENT
2018-03-15 15:07 ` [PATCH 36/36] arm: dts: armada-370-seagate-personal-cloud*: " Gregory CLEMENT
2018-03-15 20:16 ` [PATCH 00/36] use SPDX-License-Identifier for 32 bits Armada SoCs and boards Jason Cooper
2018-03-19 16:41 ` Gregory CLEMENT
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180315150717.10588-10-gregory.clement@bootlin.com \
--to=gregory.clement@bootlin.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).