Skip to content

Commit 56cb4e5

Browse files
KAGA-KOKOdavem330
authored andcommitted
net: sun: cassini: Cleanup license conflict
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: c861ef8 ("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>
1 parent 49a5785 commit 56cb4e5

File tree

2 files changed

+2
-28
lines changed

2 files changed

+2
-28
lines changed

drivers/net/ethernet/sun/cassini.c

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,9 @@
1-
// SPDX-License-Identifier: GPL-2.0
1+
// SPDX-License-Identifier: GPL-2.0+
22
/* cassini.c: Sun Microsystems Cassini(+) ethernet driver.
33
*
44
* Copyright (C) 2004 Sun Microsystems Inc.
55
* Copyright (C) 2003 Adrian Sun (asun@darksunrising.com)
66
*
7-
* This program is free software; you can redistribute it and/or
8-
* modify it under the terms of the GNU General Public License as
9-
* published by the Free Software Foundation; either version 2 of the
10-
* License, or (at your option) any later version.
11-
*
12-
* This program is distributed in the hope that it will be useful,
13-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
14-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15-
* GNU General Public License for more details.
16-
*
17-
* You should have received a copy of the GNU General Public License
18-
* along with this program; if not, see <http://www.gnu.org/licenses/>.
19-
*
207
* This driver uses the sungem driver (c) David Miller
218
* (davem@redhat.com) as its basis.
229
*

drivers/net/ethernet/sun/cassini.h

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,10 @@
1-
/* SPDX-License-Identifier: GPL-2.0 */
1+
/* SPDX-License-Identifier: GPL-2.0+ */
22
/* $Id: cassini.h,v 1.16 2004/08/17 21:15:16 zaumen Exp $
33
* cassini.h: Definitions for Sun Microsystems Cassini(+) ethernet driver.
44
*
55
* Copyright (C) 2004 Sun Microsystems Inc.
66
* Copyright (c) 2003 Adrian Sun (asun@darksunrising.com)
77
*
8-
* This program is free software; you can redistribute it and/or
9-
* modify it under the terms of the GNU General Public License as
10-
* published by the Free Software Foundation; either version 2 of the
11-
* License, or (at your option) any later version.
12-
*
13-
* This program is distributed in the hope that it will be useful,
14-
* but WITHOUT ANY WARRANTY; without even the implied warranty of
15-
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16-
* GNU General Public License for more details.
17-
*
18-
* You should have received a copy of the GNU General Public License
19-
* along with this program; if not, see <http://www.gnu.org/licenses/>.
20-
*
218
* vendor id: 0x108E (Sun Microsystems, Inc.)
229
* device id: 0xabba (Cassini)
2310
* revision ids: 0x01 = Cassini

0 commit comments

Comments
 (0)