From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF51BC04AB3 for ; Mon, 27 May 2019 13:39:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7DAC12133F for ; Mon, 27 May 2019 13:39:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="Q+l/PHhG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726843AbfE0NjK (ORCPT ); Mon, 27 May 2019 09:39:10 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:40170 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726758AbfE0NjF (ORCPT ); Mon, 27 May 2019 09:39:05 -0400 Received: by mail-wm1-f65.google.com with SMTP id 15so15870409wmg.5 for ; Mon, 27 May 2019 06:39:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rXvaj3vUDYa9PEjMxbjGSAemm+pe/cxaMoF6H3fQNUY=; b=Q+l/PHhGVu51hTqZYdAfAdFQSOivF3m2nfu/Y1lh6dSmHYVjPpAtM9SppJmt36DwiS 8e+PHIw8Hd1PNm4RtvY3Q8VQnLCVCzFu7Q7C3qaD3UCvI43VAhlw/YgOx+FyK9C8z9ZG tEajQcG1cPZ3cgfc4lCGbI3SfxBm+9kOgxvWrwp4CLqMDycJ9w6hMpLF3ki9Oy6sjdFR MtPRxPUafv20m4UZNN6pYh2n4jTPODTNe6PFv9kdiP2x7016xNsTa1emET1RlM7QvWFt S1R1+xBQYar0c9TjabnpI/uf2N+qr7k38vBef+DFHUa7EBRqtlREf4tBuPKHZaBDJzFf pfMQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rXvaj3vUDYa9PEjMxbjGSAemm+pe/cxaMoF6H3fQNUY=; b=bh1gP8DK+0Prbkv7Op+6YOYjt/estKTB+lDm2q9ljrVw/ELVpXAZRd6fE5oeXD2ZBF g/RBOOrctE17K162sKAnped8rsiO5/lpXG1yxg0IO8smMto4rS4xMi+/ect7bJDVx3Sx klDm/c+KIxV4AY/vWuZ96AHqXMS314wbZfzda0VkHR4ro3OkygJ83ypXDanp1b5gUxup y/paOqUHPW2OHpVjzRM4nu8TBEjZGvIsat25JASZn3jTU8Sd/H4ivGcBn3G0/K+cgzPy 5Ak6rFZXT9yHQAcEh6Frx4/U522htMQu/cSWTHZ7KF8lMcvm+h3TbcvE2y6YyJ6xTreb heTg== X-Gm-Message-State: APjAAAWDem3NZrycEAiiVmq3MrTSdFKj92OwC7kY6oalqm8KJlQsUvZw BoiBPJtoUQhy7O2zxwv5e5JAweZn2mFnyA== X-Google-Smtp-Source: APXvYqxE4aKHzOrcgMiwac+ZfptW5NzdYTrUzpPpU/O+y1MWCV9kobFuWkgBeYF0aTGmeExPm8e1Vw== X-Received: by 2002:a7b:c442:: with SMTP id l2mr10420507wmi.50.1558964342824; Mon, 27 May 2019 06:39:02 -0700 (PDT) Received: from bender.baylibre.local (lmontsouris-657-1-212-31.w90-63.abo.wanadoo.fr. [90.63.244.31]) by smtp.gmail.com with ESMTPSA id a124sm7838335wmh.3.2019.05.27.06.39.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 27 May 2019 06:39:02 -0700 (PDT) From: Neil Armstrong To: khilman@baylibre.com Cc: linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Neil Armstrong Subject: [PATCH v2 02/10] ARM: dts: meson6-atv1200: update with SPDX Licence identifier Date: Mon, 27 May 2019 15:38:49 +0200 Message-Id: <20190527133857.30108-3-narmstrong@baylibre.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190527133857.30108-1-narmstrong@baylibre.com> References: <20190527133857.30108-1-narmstrong@baylibre.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 - * - * 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