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=-7.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS 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 F0EDBC31681 for ; Mon, 21 Jan 2019 19:16:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C793821721 for ; Mon, 21 Jan 2019 19:16:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="D2L/mzr2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727920AbfAUTQT (ORCPT ); Mon, 21 Jan 2019 14:16:19 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:34450 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726078AbfAUTQT (ORCPT ); Mon, 21 Jan 2019 14:16:19 -0500 Received: by mail-pg1-f195.google.com with SMTP id j10so9898141pga.1 for ; Mon, 21 Jan 2019 11:16:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-transfer-encoding:content-language; bh=Y1c1qQ+Y8DuEtxZp/FDBuUihxmFgWJxDuw8Btx4Ht1w=; b=D2L/mzr2Sv+Kk3kFm7c8ip4zZeLJAnK7A0wYkbu3bT9s6A66/csqI2AVmffYlC7GdZ PbFnf723EDSEe7OlZ4RWhT6DJ4rOjBpGczMuNVrXoFTt8az40WriLr5po5UEp4gNRn8U eWBQ7ALYGJ8kz9nQIphN0hOwlqAYoIeYn8V5psoZ0CNvDgX5Zk1Id97cNdwmfTGmdm6+ +7V8ItawhGylOB+OEiqc9gnob8DHI3zy9YMT3gq9FDejkPjhGiqjaJHGOlYtQ992vOev axDrle7WCWXt7PnmPhJfNwxCNn8kPxGKIKRQvDQnx2j1IUzB/4ubJoJ2LfGFkgpbDjdp 4LVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-transfer-encoding :content-language; bh=Y1c1qQ+Y8DuEtxZp/FDBuUihxmFgWJxDuw8Btx4Ht1w=; b=ZANe3kBovMiPVHU6ikyoclGjbrQgpM+TbpdvmTaqQxAjgwS5yCeyzOM7BmVVFnjBRS 8qjXNKKRlzRGVqamxjlZ/SCYrBZTs4jIi5lPExMWf6ePjj03mBFHbXNzZlukA8oZvpqH nIHAFhuY/YzGHvUbi4fToCug1ZfQwZSaGROKUbcof1JNibHXkHAddaPaGZ9qqn2d65rP kNrc20pWaImGypmoBk2OMbgS5BXJkv7IbRDSpzihSFbiFO9o8+YIHO9Gm1Ib14cd6tcg kiaszygP4SH5B7jKwzZvEY9Qq3MONUZ2BWcrG+ULl2guxwrYTV4g2bnmcc0ydSzMiFKa DKSg== X-Gm-Message-State: AJcUukdgaE320uVdpM2XHiwNzhTyXDy89jPqNByuOYFM+rWZ8is6uZYZ /Wj1BpZ7ckG45LwM5YeSS/U= X-Google-Smtp-Source: ALg8bN4dGJhZs7LK1d9aqoX62Du0r1rRs9WEAbzF4DWuMSjsdL1ZXxuHEZu5QcAY7FnlKEYzxB2u4w== X-Received: by 2002:a62:1043:: with SMTP id y64mr31176032pfi.78.1548098178289; Mon, 21 Jan 2019 11:16:18 -0800 (PST) Received: from ?IPv6:2001:df0:0:200c:e01c:d0a0:a084:b74a? ([2001:df0:0:200c:e01c:d0a0:a084:b74a]) by smtp.gmail.com with ESMTPSA id r130sm20279260pfr.48.2019.01.21.11.16.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Jan 2019 11:16:17 -0800 (PST) Subject: Re: [PATCH] net: phy: Fixup GPLv2+ SPDX tags based on license text To: Andrew Lunn , David Miller Cc: netdev , Florian Fainelli , Heiner Kallweit , David Wu , Dongpo Li , Thomas Gleixner References: <1548094129-15993-1-git-send-email-andrew@lunn.ch> From: Michael Schmitz Message-ID: <98ba7abb-5b3f-1216-87fa-20443b6720a7@gmail.com> Date: Tue, 22 Jan 2019 08:16:12 +1300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.2.1 MIME-Version: 1.0 In-Reply-To: <1548094129-15993-1-git-send-email-andrew@lunn.ch> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org For the asix.c patch: Acked-by: Michael Schmitz On 22/01/19 7:08 AM, Andrew Lunn wrote: > A few PHY drivers have the GPLv2+ license text. They then either have > a MODULE_LICENSE() of GPLv2 only, or an SPDX tag of GPLv2 only. > > Since the license text is much easier to understand than either the > SPDX tag or the MODULE_LICENSE, use it as the definitive source of the > licence, and fixup the others when there are contradictions. > > Cc: David Wu > Cc: Dongpo Li > Cc: Michael Schmitz > Signed-off-by: Andrew Lunn > --- > drivers/net/phy/asix.c | 8 +------- > drivers/net/phy/mdio-hisi-femac.c | 16 ++-------------- > drivers/net/phy/rockchip.c | 9 ++------- > 3 files changed, 5 insertions(+), 28 deletions(-) > > diff --git a/drivers/net/phy/asix.c b/drivers/net/phy/asix.c > index 8ebe7f5484ae..f14ba5366b91 100644 > --- a/drivers/net/phy/asix.c > +++ b/drivers/net/phy/asix.c > @@ -1,13 +1,7 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0+ > /* Driver for Asix PHYs > * > * Author: Michael Schmitz > - * > - * This program 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. > - * > */ > #include > #include > diff --git a/drivers/net/phy/mdio-hisi-femac.c b/drivers/net/phy/mdio-hisi-femac.c > index b03fedd6c1d8..287f3ccf1da1 100644 > --- a/drivers/net/phy/mdio-hisi-femac.c > +++ b/drivers/net/phy/mdio-hisi-femac.c > @@ -1,20 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0+ > /* > * Hisilicon Fast Ethernet MDIO Bus Driver > * > * Copyright (c) 2016 HiSilicon Technologies Co., Ltd. > - * > - * This program 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 program 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 program. If not, see . > */ > > #include > @@ -163,4 +151,4 @@ module_platform_driver(hisi_femac_mdio_driver); > > MODULE_DESCRIPTION("Hisilicon Fast Ethernet MAC MDIO interface driver"); > MODULE_AUTHOR("Dongpo Li "); > -MODULE_LICENSE("GPL v2"); > +MODULE_LICENSE("GPL"); > diff --git a/drivers/net/phy/rockchip.c b/drivers/net/phy/rockchip.c > index f1da70b9b55f..95abf7072f32 100644 > --- a/drivers/net/phy/rockchip.c > +++ b/drivers/net/phy/rockchip.c > @@ -1,3 +1,4 @@ > +// SPDX-License-Identifier: GPL-2.0+ > /** > * drivers/net/phy/rockchip.c > * > @@ -6,12 +7,6 @@ > * Copyright (c) 2017, Fuzhou Rockchip Electronics Co., Ltd > * > * David Wu > - * > - * This program 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. > - * > */ > > #include > @@ -229,4 +224,4 @@ MODULE_DEVICE_TABLE(mdio, rockchip_phy_tbl); > > MODULE_AUTHOR("David Wu "); > MODULE_DESCRIPTION("Rockchip Ethernet PHY driver"); > -MODULE_LICENSE("GPL v2"); > +MODULE_LICENSE("GPL");