linux-amlogic.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: Neil Armstrong <narmstrong@baylibre.com>
To: khilman@baylibre.com
Cc: linux-amlogic@lists.infradead.org, linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	Neil Armstrong <narmstrong@baylibre.com>
Subject: [PATCH v2 02/10] ARM: dts: meson6-atv1200: update with SPDX Licence identifier
Date: Mon, 27 May 2019 15:38:49 +0200	[thread overview]
Message-ID: <20190527133857.30108-3-narmstrong@baylibre.com> (raw)
In-Reply-To: <20190527133857.30108-1-narmstrong@baylibre.com>

While the text specifies "of the GPL or the X11 license" the actual
license text matches the MIT license as specified at [0]

[0] https://spdx.org/licenses/MIT.html

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 arch/arm/boot/dts/meson6-atv1200.dts | 44 +---------------------------
 1 file changed, 1 insertion(+), 43 deletions(-)

diff --git a/arch/arm/boot/dts/meson6-atv1200.dts b/arch/arm/boot/dts/meson6-atv1200.dts
index 997e69c5963e..98e1c94c0261 100644
--- a/arch/arm/boot/dts/meson6-atv1200.dts
+++ b/arch/arm/boot/dts/meson6-atv1200.dts
@@ -1,48 +1,6 @@
+// SPDX-License-Identifier: GPL-2.0 OR MIT
 /*
  * Copyright 2014 Carlo Caione <carlo@caione.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 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 library; if not, write to the Free
- *     Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
- *     MA 02110-1301 USA
- *
- * 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.21.0


_______________________________________________
linux-amlogic mailing list
linux-amlogic@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-amlogic

  parent reply	other threads:[~2019-05-27 13:39 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-27 13:38 [PATCH v2 00/10] ARM: meson: update with SPDX Licence identifier Neil Armstrong
2019-05-27 13:38 ` [PATCH v2 01/10] ARM: dts: " Neil Armstrong
2019-05-27 18:05   ` Martin Blumenstingl
2019-06-03 22:27   ` Kevin Hilman
2019-05-27 13:38 ` Neil Armstrong [this message]
2019-05-27 18:06   ` [PATCH v2 02/10] ARM: dts: meson6-atv1200: " Martin Blumenstingl
2019-05-27 13:38 ` [PATCH v2 03/10] ARM: dts: meson6: " Neil Armstrong
2019-05-27 18:06   ` Martin Blumenstingl
2019-07-03 14:37   ` Marc Gonzalez
2019-05-27 13:38 ` [PATCH v2 04/10] ARM: dts: meson8-minix-neo-x8: " Neil Armstrong
2019-05-27 18:06   ` Martin Blumenstingl
2019-05-27 13:38 ` [PATCH v2 05/10] ARM: dts: meson8: " Neil Armstrong
2019-05-27 18:07   ` Martin Blumenstingl
2019-05-27 13:38 ` [PATCH v2 06/10] ARM: dts: meson8b-mxq: " Neil Armstrong
2019-05-27 18:07   ` Martin Blumenstingl
2019-05-27 13:38 ` [PATCH v2 07/10] ARM: dts: meson8b-odroidc1: " Neil Armstrong
2019-05-27 18:07   ` Martin Blumenstingl
2019-05-27 13:38 ` [PATCH v2 08/10] ARM: dts: meson8b: " Neil Armstrong
2019-05-27 18:07   ` Martin Blumenstingl
2019-05-27 13:38 ` [PATCH v2 09/10] ARM: debug: meson.S: " Neil Armstrong
2019-05-27 13:38 ` [PATCH v2 10/10] ARM: mach-meson: " Neil Armstrong
2019-05-27 18:07   ` Martin Blumenstingl
2019-06-03 22:39   ` Kevin Hilman

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=20190527133857.30108-3-narmstrong@baylibre.com \
    --to=narmstrong@baylibre.com \
    --cc=khilman@baylibre.com \
    --cc=linux-amlogic@lists.infradead.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.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).