Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: phy: Fixup GPLv2+ SPDX tags based on license text

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 <david.wu@rock-chips.com>
Cc: Dongpo Li <lidongpo@hisilicon.com>
Cc: Michael Schmitz <schmitzmic@gmail.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Acked-by: Michael Schmitz <schmitzmic@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Andrew Lunn and committed by
David S. Miller
ab06418b 25974d8a

+5 -28
+1 -7
drivers/net/phy/asix.c
··· 1 - // SPDX-License-Identifier: GPL-2.0 1 + // SPDX-License-Identifier: GPL-2.0+ 2 2 /* Driver for Asix PHYs 3 3 * 4 4 * Author: Michael Schmitz <schmitzmic@gmail.com> 5 - * 6 - * This program is free software; you can redistribute it and/or modify it 7 - * under the terms of the GNU General Public License as published by the 8 - * Free Software Foundation; either version 2 of the License, or (at your 9 - * option) any later version. 10 - * 11 5 */ 12 6 #include <linux/kernel.h> 13 7 #include <linux/errno.h>
+2 -14
drivers/net/phy/mdio-hisi-femac.c
··· 1 + // SPDX-License-Identifier: GPL-2.0+ 1 2 /* 2 3 * Hisilicon Fast Ethernet MDIO Bus Driver 3 4 * 4 5 * Copyright (c) 2016 HiSilicon Technologies Co., Ltd. 5 - * 6 - * This program is free software; you can redistribute it and/or modify 7 - * it under the terms of the GNU General Public License as published by 8 - * the Free Software Foundation; either version 2 of the License, or 9 - * (at your option) any later version. 10 - * 11 - * This program is distributed in the hope that it will be useful, 12 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 13 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 - * GNU General Public License for more details. 15 - * 16 - * You should have received a copy of the GNU General Public License 17 - * along with this program. If not, see <http://www.gnu.org/licenses/>. 18 6 */ 19 7 20 8 #include <linux/clk.h> ··· 151 163 152 164 MODULE_DESCRIPTION("Hisilicon Fast Ethernet MAC MDIO interface driver"); 153 165 MODULE_AUTHOR("Dongpo Li <lidongpo@hisilicon.com>"); 154 - MODULE_LICENSE("GPL v2"); 166 + MODULE_LICENSE("GPL");
+2 -7
drivers/net/phy/rockchip.c
··· 1 + // SPDX-License-Identifier: GPL-2.0+ 1 2 /** 2 3 * drivers/net/phy/rockchip.c 3 4 * ··· 7 6 * Copyright (c) 2017, Fuzhou Rockchip Electronics Co., Ltd 8 7 * 9 8 * David Wu <david.wu@rock-chips.com> 10 - * 11 - * This program is free software; you can redistribute it and/or modify 12 - * it under the terms of the GNU General Public License as published by 13 - * the Free Software Foundation; either version 2 of the License, or 14 - * (at your option) any later version. 15 - * 16 9 */ 17 10 18 11 #include <linux/ethtool.h> ··· 224 229 225 230 MODULE_AUTHOR("David Wu <david.wu@rock-chips.com>"); 226 231 MODULE_DESCRIPTION("Rockchip Ethernet PHY driver"); 227 - MODULE_LICENSE("GPL v2"); 232 + MODULE_LICENSE("GPL");