| Message ID | 87muqkytbv.wl-kuninori.morimoto.gx@renesas.com |
|---|---|
| State | Accepted |
| Delegated to: | Miquel Raynal |
| Headers | show |
| Series | mtd: rawnand: sh_flctl: convert to SPDX identifiers | expand |
On Thu, 8 Nov 2018 06:39:20 +0000 Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> wrote: > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > This patch updates license to use SPDX-License-Identifier > instead of verbose license text. > > As original license mentioned, it is GPL-2.0 in SPDX. > Then, MODULE_LICENSE() should be "GPL v2" instead of "GPL". > See ${LINUX}/include/linux/module.h > > "GPL" [GNU Public License v2 or later] > "GPL v2" [GNU Public License v2] I had a similar case recently and I based my SPDX tag on the MODULE_LICENSE() value instead of the license header. Is this "license header" > MODULE_LICENSE() rule documented somewhere?
On Thu, 8 Nov 2018 09:57:28 +0100 Boris Brezillon <boris.brezillon@bootlin.com> wrote: > On Thu, 8 Nov 2018 06:39:20 +0000 > Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> wrote: > > > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > > > This patch updates license to use SPDX-License-Identifier > > instead of verbose license text. > > > > As original license mentioned, it is GPL-2.0 in SPDX. > > Then, MODULE_LICENSE() should be "GPL v2" instead of "GPL". > > See ${LINUX}/include/linux/module.h > > > > "GPL" [GNU Public License v2 or later] > > "GPL v2" [GNU Public License v2] > > I had a similar case recently and I based my SPDX tag on the > MODULE_LICENSE() value instead of the license header. > Is this "license header" > MODULE_LICENSE() rule documented > somewhere? Looks like you made the right choice [1]. I'll fix my patches to follow this rule. [1]https://lore.kernel.org/linux-rtc/20180625015832.GB30408@kroah.com/
Hi Boris > > > This patch updates license to use SPDX-License-Identifier > > > instead of verbose license text. > > > > > > As original license mentioned, it is GPL-2.0 in SPDX. > > > Then, MODULE_LICENSE() should be "GPL v2" instead of "GPL". > > > See ${LINUX}/include/linux/module.h > > > > > > "GPL" [GNU Public License v2 or later] > > > "GPL v2" [GNU Public License v2] > > > > I had a similar case recently and I based my SPDX tag on the > > MODULE_LICENSE() value instead of the license header. > > Is this "license header" > MODULE_LICENSE() rule documented > > somewhere? > > Looks like you made the right choice [1]. I'll fix my patches to follow > this rule. > > [1]https://lore.kernel.org/linux-rtc/20180625015832.GB30408@kroah.com/ Thanks. Nice to know
Hi Kuninori, Boris Brezillon <boris.brezillon@bootlin.com> wrote on Thu, 8 Nov 2018 09:57:28 +0100: > On Thu, 8 Nov 2018 06:39:20 +0000 > Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> wrote: > > > From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> > > > > This patch updates license to use SPDX-License-Identifier > > instead of verbose license text. > > > > As original license mentioned, it is GPL-2.0 in SPDX. > > Then, MODULE_LICENSE() should be "GPL v2" instead of "GPL". > > See ${LINUX}/include/linux/module.h > > > > "GPL" [GNU Public License v2 or later] > > "GPL v2" [GNU Public License v2] Applied to nand/next. Thanks, Miquèl
diff --git a/drivers/mtd/nand/raw/sh_flctl.c b/drivers/mtd/nand/raw/sh_flctl.c index 4d20d03..30edcc7 100644 --- a/drivers/mtd/nand/raw/sh_flctl.c +++ b/drivers/mtd/nand/raw/sh_flctl.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * SuperH FLCTL nand controller * @@ -5,20 +6,6 @@ * Copyright (c) 2008 Atom Create Engineering Co., Ltd. * * Based on fsl_elbc_nand.c, Copyright (c) 2006-2007 Freescale Semiconductor - * - * 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 of the License. - * - * 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, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * */ #include <linux/module.h> @@ -1236,7 +1223,7 @@ static struct platform_driver flctl_driver = { module_platform_driver_probe(flctl_driver, flctl_probe); -MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL v2"); MODULE_AUTHOR("Yoshihiro Shimoda"); MODULE_DESCRIPTION("SuperH FLCTL driver"); MODULE_ALIAS("platform:sh_flctl"); diff --git a/include/linux/mtd/sh_flctl.h b/include/linux/mtd/sh_flctl.h index c759d40..78fc2d4 100644 --- a/include/linux/mtd/sh_flctl.h +++ b/include/linux/mtd/sh_flctl.h @@ -1,20 +1,8 @@ -/* +/* SPDX-License-Identifier: GPL-2.0 + * * SuperH FLCTL nand controller * * Copyright © 2008 Renesas Solutions Corp. - * - * 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 of the License. - * - * 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, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef __SH_FLCTL_H__