On Fri, Jan 18, 2019 at 2:51 AM Thomas Gleixner <t...@linutronix.de> wrote: > > 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 <t...@linutronix.de> > Cc: Shannon Nelson <shannon.nel...@oracle.com> > Cc: Zhu Yanjun <yanjun....@oracle.com> > Cc: David S. Miller <da...@davemloft.net> > Cc: net...@vger.kernel.org > Cc: sta...@vger.kernel.org
Thanks, Thomas. Acked-by: Shannon Nelson <shannon.lee.nel...@gmail.com> > --- > 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 (a...@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 > * (da...@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 (a...@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 -- ============================================== Mr. Shannon Nelson Parents can't afford to be squeamish.