| From 56cb4e5034998b5522a657957321ca64ca2ea0a0 Mon Sep 17 00:00:00 2001 |
| From: Thomas Gleixner <tglx@linutronix.de> |
| Date: Fri, 18 Jan 2019 11:49:58 +0100 |
| Subject: net: sun: cassini: Cleanup license conflict |
| |
| From: Thomas Gleixner <tglx@linutronix.de> |
| |
| commit 56cb4e5034998b5522a657957321ca64ca2ea0a0 upstream. |
| |
| The recent addition of SPDX license identifiers to the files in |
| drivers/net/ethernet/sun created a licensing conflict. |
| |
| The cassini driver files contain a proper license notice: |
| |
| * 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. |
| |
| but the SPDX change added: |
| |
| SPDX-License-Identifier: GPL-2.0 |
| |
| So the file got tagged GPL v2 only while in fact it is licensed under GPL |
| v2 or later. |
| |
| It's nice that people care about the SPDX tags, but they need to be more |
| careful about it. Not everything under (the) sun belongs to ... |
| |
| Fix up the SPDX identifier and remove the boiler plate text as it is |
| redundant. |
| |
| Fixes: c861ef83d771 ("sun: Add SPDX license tags to Sun network drivers") |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| Cc: Shannon Nelson <shannon.nelson@oracle.com> |
| Cc: Zhu Yanjun <yanjun.zhu@oracle.com> |
| Cc: David S. Miller <davem@davemloft.net> |
| Cc: netdev@vger.kernel.org |
| Cc: stable@vger.kernel.org |
| Acked-by: Shannon Nelson <shannon.lee.nelson@gmail.com> |
| Reviewed-by: Zhu Yanjun <yanjun.zhu@oracle.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/net/ethernet/sun/cassini.c | 15 +-------------- |
| drivers/net/ethernet/sun/cassini.h | 15 +-------------- |
| 2 files changed, 2 insertions(+), 28 deletions(-) |
| |
| --- a/drivers/net/ethernet/sun/cassini.c |
| +++ b/drivers/net/ethernet/sun/cassini.c |
| @@ -1,22 +1,9 @@ |
| -// SPDX-License-Identifier: GPL-2.0 |
| +// SPDX-License-Identifier: GPL-2.0+ |
| /* cassini.c: Sun Microsystems Cassini(+) ethernet driver. |
| * |
| * Copyright (C) 2004 Sun Microsystems Inc. |
| * Copyright (C) 2003 Adrian Sun (asun@darksunrising.com) |
| * |
| - * 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 <http://www.gnu.org/licenses/>. |
| - * |
| * This driver uses the sungem driver (c) David Miller |
| * (davem@redhat.com) as its basis. |
| * |
| --- a/drivers/net/ethernet/sun/cassini.h |
| +++ b/drivers/net/ethernet/sun/cassini.h |
| @@ -1,23 +1,10 @@ |
| -/* SPDX-License-Identifier: GPL-2.0 */ |
| +/* SPDX-License-Identifier: GPL-2.0+ */ |
| /* $Id: cassini.h,v 1.16 2004/08/17 21:15:16 zaumen Exp $ |
| * cassini.h: Definitions for Sun Microsystems Cassini(+) ethernet driver. |
| * |
| * Copyright (C) 2004 Sun Microsystems Inc. |
| * Copyright (c) 2003 Adrian Sun (asun@darksunrising.com) |
| * |
| - * 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 <http://www.gnu.org/licenses/>. |
| - * |
| * vendor id: 0x108E (Sun Microsystems, Inc.) |
| * device id: 0xabba (Cassini) |
| * revision ids: 0x01 = Cassini |