From: bage@linutronix.de
To: devicetree@vger.kernel.org
Cc: Bastian Germann <bage@linutronix.de>,
Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Maxime Ripard <mripard@kernel.org>,
Benedikt Spranger <b.spranger@linutronix.de>,
Jelle de Jong <jelledejong@powercraft.nl>,
linux-spdx@vger.kernel.org
Subject: [PATCH 3/5] ARM: dts: sun7i: lamobo-r1: Use SPDX identifier
Date: Thu, 6 Feb 2020 12:33:25 +0100 [thread overview]
Message-ID: <20200206113328.7296-4-bage@linutronix.de> (raw)
In-Reply-To: <20200206113328.7296-1-bage@linutronix.de>
From: Bastian Germann <bage@linutronix.de>
Adopt the SPDX license identifier.
The 2nd license text is specified by SPDX as MIT. So the identifier has
to be (GPL-2.0-or-later OR MIT). SPDX's X11 has an additional advertising
clause.
Co-developed-by: Benedikt Spranger <b.spranger@linutronix.de>
Signed-off-by: Benedikt Spranger <b.spranger@linutronix.de>
Signed-off-by: Bastian Germann <bage@linutronix.de>
Cc: Jelle de Jong <jelledejong@powercraft.nl>
Cc: linux-spdx@vger.kernel.org
---
arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 39 +----------------------
1 file changed, 1 insertion(+), 38 deletions(-)
diff --git a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
index 17fa8901fc00..37cbd78ea07c 100644
--- a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
+++ b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
@@ -1,43 +1,6 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later OR MIT)
/*
* Copyright 2015 Jelle de Jong <jelledejong@powercraft.nl>
- *
- * 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.20.1
next prev parent reply other threads:[~2020-02-06 11:33 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-06 11:33 [PATCH 0/5] dts: Add Linutronix Testbox bage
2020-02-06 11:33 ` [PATCH 1/5] dt-bindings: Add vendor prefix lx for Linutronix bage
2020-02-06 21:55 ` Rob Herring
2020-02-10 7:43 ` Maxime Ripard
2020-02-11 17:15 ` Rob Herring
2020-02-12 9:39 ` Benedikt Spranger
2020-02-12 11:56 ` Maxime Ripard
2020-02-06 11:33 ` [PATCH 2/5] dt-bindings: arm: sunxi: Add Linutronix Testbox bage
2020-02-06 21:58 ` Rob Herring
2020-02-06 11:33 ` bage [this message]
2020-02-06 12:54 ` [PATCH 3/5] ARM: dts: sun7i: lamobo-r1: Use SPDX identifier Thomas Gleixner
2020-02-06 11:33 ` [PATCH 4/5] ARM: dts: sun7i: lamobo-r1: Split out commons bage
2020-02-10 7:45 ` Maxime Ripard
2020-02-12 10:01 ` Benedikt Spranger
2020-02-12 12:26 ` Maxime Ripard
2020-02-06 11:33 ` [PATCH 5/5] ARM: dts: sun7i: Add Linutronix Testbox v2 board bage
2020-02-10 7:56 ` Maxime Ripard
2020-02-12 11:20 ` Benedikt Spranger
2020-02-12 12:33 ` Maxime Ripard
2020-02-14 11:10 ` [PATCH v2 0/3] dts: Add Linutronix Testbox bage
2020-02-14 11:10 ` [PATCH v2 1/3] dt-bindings: Add vendor prefix for Linutronix bage
2020-02-14 13:21 ` Maxime Ripard
2020-02-19 20:06 ` Rob Herring
2020-02-14 11:10 ` [PATCH v2 2/3] dt-bindings: arm: sunxi: Add Linutronix Testbox bage
2020-02-14 11:10 ` [PATCH v2 3/3] ARM: dts: sun7i: Add Linutronix Testbox v2 board bage
2020-02-14 13:26 ` Maxime Ripard
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=20200206113328.7296-4-bage@linutronix.de \
--to=bage@linutronix.de \
--cc=b.spranger@linutronix.de \
--cc=devicetree@vger.kernel.org \
--cc=jelledejong@powercraft.nl \
--cc=linux-spdx@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mripard@kernel.org \
--cc=robh+dt@kernel.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).