| Message ID | 20181031190645.30709-5-grygorii.strashko@ti.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | driver: net: ti: clean up and code optimization | expand |
On Wed, Oct 31, 2018 at 4:07 PM Grygorii Strashko <grygorii.strashko@ti.com> wrote: > > Update to use SPDX license identifier. > > Reviewed-by: Tom Rini <trini@konsulko.com> > Acked-by: Joe Hershberger <joe.hershberger@ni.com> > Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com> > --- > drivers/net/ti/cpsw.c | 12 ++---------- > 1 file changed, 2 insertions(+), 10 deletions(-) > > diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c > index 8e2a48c..fe43d14 100644 > --- a/drivers/net/ti/cpsw.c > +++ b/drivers/net/ti/cpsw.c > @@ -1,16 +1,8 @@ > +// SPDX-License-Identifier: GPL-2.0+ Here you say GPL-2.0 or later... > /* > * CPSW Ethernet Switch Driver > * > - * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.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 version 2. but the original license says GPL-2.0. so there is a mismatch between the SPDX and original license.
On Tuesday 06 November 2018 12:07 AM, Fabio Estevam wrote: > On Wed, Oct 31, 2018 at 4:07 PM Grygorii Strashko > <grygorii.strashko@ti.com> wrote: >> >> Update to use SPDX license identifier. >> >> Reviewed-by: Tom Rini <trini@konsulko.com> >> Acked-by: Joe Hershberger <joe.hershberger@ni.com> >> Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com> >> --- >> drivers/net/ti/cpsw.c | 12 ++---------- >> 1 file changed, 2 insertions(+), 10 deletions(-) >> >> diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c >> index 8e2a48c..fe43d14 100644 >> --- a/drivers/net/ti/cpsw.c >> +++ b/drivers/net/ti/cpsw.c >> @@ -1,16 +1,8 @@ >> +// SPDX-License-Identifier: GPL-2.0+ > > Here you say GPL-2.0 or later... why? Licenses/README says GPL-2.0+ is a valid SPDX License Expression. Also rest of the u-boot files follow the same convention. Thanks and regards, Lokesh > >> /* >> * CPSW Ethernet Switch Driver >> * >> - * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.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 version 2. > > but the original license says GPL-2.0. > > so there is a mismatch between the SPDX and original license. >
On Tue, Nov 06, 2018 at 09:44:16AM +0530, Lokesh Vutla wrote: > > > On Tuesday 06 November 2018 12:07 AM, Fabio Estevam wrote: > >On Wed, Oct 31, 2018 at 4:07 PM Grygorii Strashko > ><grygorii.strashko@ti.com> wrote: > >> > >>Update to use SPDX license identifier. > >> > >>Reviewed-by: Tom Rini <trini@konsulko.com> > >>Acked-by: Joe Hershberger <joe.hershberger@ni.com> > >>Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com> > >>--- > >> drivers/net/ti/cpsw.c | 12 ++---------- > >> 1 file changed, 2 insertions(+), 10 deletions(-) > >> > >>diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c > >>index 8e2a48c..fe43d14 100644 > >>--- a/drivers/net/ti/cpsw.c > >>+++ b/drivers/net/ti/cpsw.c > >>@@ -1,16 +1,8 @@ > >>+// SPDX-License-Identifier: GPL-2.0+ > > > >Here you say GPL-2.0 or later... > > why? Licenses/README says GPL-2.0+ is a valid SPDX License Expression. Also > rest of the u-boot files follow the same convention. > > Thanks and regards, > Lokesh > > > > >> /* > >> * CPSW Ethernet Switch Driver > >> * > >>- * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.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 version 2. > > > >but the original license says GPL-2.0. > > > >so there is a mismatch between the SPDX and original license. Ah, I think you both missed his point, sorry. It's not about the format of the tag but that the text is "GPL 2.0" and the tag is "GPL 2.0 or later" instead of "GPL 2.0". Now, can TI change the tag here? Yes? But, should we do it during the SPDX conversion rather than explicitly? No, probably not. At least not without a commit message being clear it's intentional. -- Tom
On Tue, Nov 6, 2018 at 2:14 AM Lokesh Vutla <lokeshvutla@ti.com> wrote: > why? Licenses/README says GPL-2.0+ is a valid SPDX License Expression. Also > rest of the u-boot files follow the same convention. Yes, GPL-2.0+ is valid, but in order to match the license text it should be: // SPDX-License-Identifier: GPL-2.0
diff --git a/drivers/net/ti/cpsw.c b/drivers/net/ti/cpsw.c index 8e2a48c..fe43d14 100644 --- a/drivers/net/ti/cpsw.c +++ b/drivers/net/ti/cpsw.c @@ -1,16 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * CPSW Ethernet Switch Driver * - * Copyright (C) 2010 Texas Instruments Incorporated - http://www.ti.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 version 2. - * - * This program is distributed "as is" WITHOUT ANY WARRANTY of any - * kind, whether express or implied; without even the implied warranty - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Copyright (C) 2010-2018 Texas Instruments Incorporated - http://www.ti.com/ */ #include <common.h>