2018-09-02 17:38:30

by Marcus Folkesson

Subject: [PATCH] usb: chipidea: imx: make MODULE_LICENCE and SPDX-identifier match

The SPDX-License-Identifier is set to GPL-2.0+, which correspond to
MODULE_LICENSE "GPL".

Signed-off-by: Marcus Folkesson <[email protected]>
---
drivers/usb/chipidea/ci_hdrc_imx.c | 2 +-
drivers/usb/chipidea/usbmisc_imx.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
index 19f5f5f2a48a..555d398fbfa7 100644
--- a/drivers/usb/chipidea/ci_hdrc_imx.c
+++ b/drivers/usb/chipidea/ci_hdrc_imx.c
@@ -492,7 +492,7 @@ static struct platform_driver ci_hdrc_imx_driver = {
module_platform_driver(ci_hdrc_imx_driver);

MODULE_ALIAS("platform:imx-usb");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("CI HDRC i.MX USB binding");
MODULE_AUTHOR("Marek Vasut <[email protected]>");
MODULE_AUTHOR("Richard Zhao <[email protected]>");
diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c
index 34ad5bf8acd8..d9cfa00b8a6c 100644
--- a/drivers/usb/chipidea/usbmisc_imx.c
+++ b/drivers/usb/chipidea/usbmisc_imx.c
@@ -633,6 +633,6 @@ static struct platform_driver usbmisc_imx_driver = {
module_platform_driver(usbmisc_imx_driver);

MODULE_ALIAS("platform:usbmisc-imx");
-MODULE_LICENSE("GPL v2");
+MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("driver for imx usb non-core registers");
MODULE_AUTHOR("Richard Zhao <[email protected]>");
--
2.18.0

2018-09-03 04:18:11

by Peter Chen

Subject: RE: [PATCH] usb: chipidea: imx: make MODULE_LICENCE and SPDX-identifier match

>
> The SPDX-License-Identifier is set to GPL-2.0+, which correspond to
> MODULE_LICENSE "GPL".
>
> Signed-off-by: Marcus Folkesson <[email protected]>
> ---
> drivers/usb/chipidea/ci_hdrc_imx.c | 2 +- drivers/usb/chipidea/usbmisc_imx.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
> index 19f5f5f2a48a..555d398fbfa7 100644
> --- a/drivers/usb/chipidea/ci_hdrc_imx.c
> +++ b/drivers/usb/chipidea/ci_hdrc_imx.c
> @@ -492,7 +492,7 @@ static struct platform_driver ci_hdrc_imx_driver =
> { module_platform_driver(ci_hdrc_imx_driver);
>
> MODULE_ALIAS("platform:imx-usb");
> -MODULE_LICENSE("GPL v2");
> +MODULE_LICENSE("GPL");
> MODULE_DESCRIPTION("CI HDRC i.MX USB binding");
> MODULE_AUTHOR("Marek Vasut <[email protected]>");
> MODULE_AUTHOR("Richard Zhao <[email protected]>"); diff --git
> a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c
> index 34ad5bf8acd8..d9cfa00b8a6c 100644
> --- a/drivers/usb/chipidea/usbmisc_imx.c
> +++ b/drivers/usb/chipidea/usbmisc_imx.c
> @@ -633,6 +633,6 @@ static struct platform_driver usbmisc_imx_driver =
> { module_platform_driver(usbmisc_imx_driver);
>
> MODULE_ALIAS("platform:usbmisc-imx");
> -MODULE_LICENSE("GPL v2");
> +MODULE_LICENSE("GPL");
> MODULE_DESCRIPTION("driver for imx usb non-core registers");
> MODULE_AUTHOR("Richard Zhao <[email protected]>");

Greg, does this is a useful change? I am not sure.

Peter

2018-09-03 12:37:36

by Greg Kroah-Hartman

Subject: Re: [PATCH] usb: chipidea: imx: make MODULE_LICENCE and SPDX-identifier match

On Mon, Sep 03, 2018 at 04:14:41AM +0000, Peter Chen wrote:
>
> >
> > The SPDX-License-Identifier is set to GPL-2.0+, which correspond to
> > MODULE_LICENSE "GPL".
> >
> > Signed-off-by: Marcus Folkesson <[email protected]>
> > ---
> > drivers/usb/chipidea/ci_hdrc_imx.c | 2 +- drivers/usb/chipidea/usbmisc_imx.c | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
> > index 19f5f5f2a48a..555d398fbfa7 100644
> > --- a/drivers/usb/chipidea/ci_hdrc_imx.c
> > +++ b/drivers/usb/chipidea/ci_hdrc_imx.c
> > @@ -492,7 +492,7 @@ static struct platform_driver ci_hdrc_imx_driver =
> > { module_platform_driver(ci_hdrc_imx_driver);
> >
> > MODULE_ALIAS("platform:imx-usb");
> > -MODULE_LICENSE("GPL v2");
> > +MODULE_LICENSE("GPL");
> > MODULE_DESCRIPTION("CI HDRC i.MX USB binding");
> > MODULE_AUTHOR("Marek Vasut <[email protected]>");
> > MODULE_AUTHOR("Richard Zhao <[email protected]>"); diff --git
> > a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c
> > index 34ad5bf8acd8..d9cfa00b8a6c 100644
> > --- a/drivers/usb/chipidea/usbmisc_imx.c
> > +++ b/drivers/usb/chipidea/usbmisc_imx.c
> > @@ -633,6 +633,6 @@ static struct platform_driver usbmisc_imx_driver =
> > { module_platform_driver(usbmisc_imx_driver);
> >
> > MODULE_ALIAS("platform:usbmisc-imx");
> > -MODULE_LICENSE("GPL v2");
> > +MODULE_LICENSE("GPL");
> > MODULE_DESCRIPTION("driver for imx usb non-core registers");
> > MODULE_AUTHOR("Richard Zhao <[email protected]>");
>
> Greg, does this is a useful change? I am not sure.

As the two licenses are not matching, something needs to be fixed here,
don't you agree?

Please read include/linux/modules.h for what the strings mean, that
should help explain things more.

greg k-h

2018-09-03 14:11:38

by Marcus Folkesson

Subject: Re: [PATCH] usb: chipidea: imx: make MODULE_LICENCE and SPDX-identifier match

Hi,

On Mon, Sep 03, 2018 at 02:36:11PM +0200, Greg Kroah-Hartman wrote:
> On Mon, Sep 03, 2018 at 04:14:41AM +0000, Peter Chen wrote:
> >
> > >
> > > The SPDX-License-Identifier is set to GPL-2.0+, which correspond to
> > > MODULE_LICENSE "GPL".
> > >
> > > Signed-off-by: Marcus Folkesson <[email protected]>
> > > ---
> > > drivers/usb/chipidea/ci_hdrc_imx.c | 2 +- drivers/usb/chipidea/usbmisc_imx.c | 2 +-
> > > 2 files changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c
> > > index 19f5f5f2a48a..555d398fbfa7 100644
> > > --- a/drivers/usb/chipidea/ci_hdrc_imx.c
> > > +++ b/drivers/usb/chipidea/ci_hdrc_imx.c
> > > @@ -492,7 +492,7 @@ static struct platform_driver ci_hdrc_imx_driver =
> > > { module_platform_driver(ci_hdrc_imx_driver);
> > >
> > > MODULE_ALIAS("platform:imx-usb");
> > > -MODULE_LICENSE("GPL v2");
> > > +MODULE_LICENSE("GPL");
> > > MODULE_DESCRIPTION("CI HDRC i.MX USB binding");
> > > MODULE_AUTHOR("Marek Vasut <[email protected]>");
> > > MODULE_AUTHOR("Richard Zhao <[email protected]>"); diff --git
> > > a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c
> > > index 34ad5bf8acd8..d9cfa00b8a6c 100644
> > > --- a/drivers/usb/chipidea/usbmisc_imx.c
> > > +++ b/drivers/usb/chipidea/usbmisc_imx.c
> > > @@ -633,6 +633,6 @@ static struct platform_driver usbmisc_imx_driver =
> > > { module_platform_driver(usbmisc_imx_driver);
> > >
> > > MODULE_ALIAS("platform:usbmisc-imx");
> > > -MODULE_LICENSE("GPL v2");
> > > +MODULE_LICENSE("GPL");
> > > MODULE_DESCRIPTION("driver for imx usb non-core registers");
> > > MODULE_AUTHOR("Richard Zhao <[email protected]>");
> >
> > Greg, does this is a useful change? I am not sure.
>
> As the two licenses are not matching, something needs to be fixed here,
> don't you agree?

I just want to fill in that the former license text (removed in
51b751f112dcbb24b46051fe64c2ddbe8aa367ea) was:

- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:

According to this, the SPDX-identifier is valid and the MODULE_LICENSE
should be fixed.

>
> Please read include/linux/modules.h for what the strings mean, that
> should help explain things more.
>
> greg k-h

Best regards
Marcus Folkesson