| Message ID | 20171213080530.12724-1-andi.shyti@samsung.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Wed, Dec 13, 2017 at 9:05 AM, Andi Shyti <andi.shyti@samsung.com> wrote: > Replace the original license statement with the SPDX identifier. > > Signed-off-by: Andi Shyti <andi.shyti@samsung.com> > --- > Hi, > > this second version unlike v1, where I tried to move the license > from GPLv2+ to GPLv2, preserves the original licese while adding > the SPDX identifier. > > Andi > > drivers/spi/spi-s3c64xx.c | 18 ++++-------------- > include/linux/platform_data/spi-s3c64xx.h | 4 +--- > 2 files changed, 5 insertions(+), 17 deletions(-) Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org> Best regards, Krzysztof -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Andi, On Wed, Dec 13, 2017 at 9:05 AM, Andi Shyti <andi.shyti@samsung.com> wrote: > Replace the original license statement with the SPDX identifier. > > Signed-off-by: Andi Shyti <andi.shyti@samsung.com> > --- > Hi, > > this second version unlike v1, where I tried to move the license > from GPLv2+ to GPLv2, preserves the original licese while adding > the SPDX identifier. > > Andi > > drivers/spi/spi-s3c64xx.c | 18 ++++-------------- > include/linux/platform_data/spi-s3c64xx.h | 4 +--- > 2 files changed, 5 insertions(+), 17 deletions(-) > > diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c > index de7df20f8712..baa3a9fa2638 100644 > --- a/drivers/spi/spi-s3c64xx.c > +++ b/drivers/spi/spi-s3c64xx.c > @@ -1,17 +1,7 @@ > -/* > - * Copyright (C) 2009 Samsung Electronics Ltd. > - * Jaswinder Singh <jassi.brar@samsung.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. > - */ > +// SPDX-License-Identifier: GPL-2.0+ > +// > +// Copyright (c) 2009 Samsung Electronics Co., Ltd. > +// Jaswinder Singh <jassi.brar@samsung.com> > > #include <linux/init.h> > #include <linux/module.h> > diff --git a/include/linux/platform_data/spi-s3c64xx.h b/include/linux/platform_data/spi-s3c64xx.h > index da79774078a7..8917f38c97c5 100644 > --- a/include/linux/platform_data/spi-s3c64xx.h > +++ b/include/linux/platform_data/spi-s3c64xx.h > @@ -2,9 +2,7 @@ > * Copyright (C) 2009 Samsung Electronics Ltd. > * Jaswinder Singh <jassi.brar@samsung.com> > * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 as > - * published by the Free Software Foundation. > + * SPDX-License-Identifier: GPL-2.0 > */ > > #ifndef __SPI_S3C64XX_H > -- > 2.15.1 > You still need to put this line at the very top of the file, first line. That's the convention for the SPDX tags as documented by Thomas Gleixner. > + * SPDX-License-Identifier: GPL-2.0
Hi Philippe, > > diff --git a/include/linux/platform_data/spi-s3c64xx.h b/include/linux/platform_data/spi-s3c64xx.h > > index da79774078a7..8917f38c97c5 100644 > > --- a/include/linux/platform_data/spi-s3c64xx.h > > +++ b/include/linux/platform_data/spi-s3c64xx.h > > @@ -2,9 +2,7 @@ > > * Copyright (C) 2009 Samsung Electronics Ltd. > > * Jaswinder Singh <jassi.brar@samsung.com> > > * > > - * This program is free software; you can redistribute it and/or modify > > - * it under the terms of the GNU General Public License version 2 as > > - * published by the Free Software Foundation. > > + * SPDX-License-Identifier: GPL-2.0 > > */ > > > > #ifndef __SPI_S3C64XX_H > > -- > > 2.15.1 > > > > > You still need to put this line at the very top of the file, first > line. That's the convention for the SPDX tags as documented by Thomas > Gleixner. I had some doubts on this one, indeed. How should it be done in this case: 1. Strictly by Thomas documentation: /* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (C) 2009 Samsung Electronics Ltd. * Jaswinder Singh <jassi.brar@samsung.com> */ or 2. with a little interpretation /* * SPDX-License-Identifier: GPL-2.0 * * Copyright (C) 2009 Samsung Electronics Ltd. * Jaswinder Singh <jassi.brar@samsung.com> */ (I opted for the one with the least number of changes) Thanks, Andi > > + * SPDX-License-Identifier: GPL-2.0 > > > -- > Cordially > Philippe Ombredanne > -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Andi, On Thu, Dec 14, 2017 at 2:31 AM, Andi Shyti <andi.shyti@samsung.com> wrote: > Hi Philippe, > >> > diff --git a/include/linux/platform_data/spi-s3c64xx.h b/include/linux/platform_data/spi-s3c64xx.h >> > index da79774078a7..8917f38c97c5 100644 >> > --- a/include/linux/platform_data/spi-s3c64xx.h >> > +++ b/include/linux/platform_data/spi-s3c64xx.h >> > @@ -2,9 +2,7 @@ >> > * Copyright (C) 2009 Samsung Electronics Ltd. >> > * Jaswinder Singh <jassi.brar@samsung.com> >> > * >> > - * This program is free software; you can redistribute it and/or modify >> > - * it under the terms of the GNU General Public License version 2 as >> > - * published by the Free Software Foundation. >> > + * SPDX-License-Identifier: GPL-2.0 >> > */ >> > >> > #ifndef __SPI_S3C64XX_H >> > -- >> > 2.15.1 >> > >> >> >> You still need to put this line at the very top of the file, first >> line. That's the convention for the SPDX tags as documented by Thomas >> Gleixner. > > I had some doubts on this one, indeed. How should it be done in > this case: > > 1. Strictly by Thomas documentation: > > /* SPDX-License-Identifier: GPL-2.0 */ > > /* > * Copyright (C) 2009 Samsung Electronics Ltd. > * Jaswinder Singh <jassi.brar@samsung.com> > */ > > or > > 2. with a little interpretation > > /* > * SPDX-License-Identifier: GPL-2.0 > * > * Copyright (C) 2009 Samsung Electronics Ltd. > * Jaswinder Singh <jassi.brar@samsung.com> > */ > > (I opted for the one with the least number of changes) You should go strictly by Thomas' doc. This is one area where consistency is the thing that brings benefits. Interpretation is not needed. So please, consider going with 1.
On Thu, Dec 14, 2017 at 10:31:09AM +0900, Andi Shyti wrote: > 1. Strictly by Thomas documentation: > > /* SPDX-License-Identifier: GPL-2.0 */ > > /* > * Copyright (C) 2009 Samsung Electronics Ltd. > * Jaswinder Singh <jassi.brar@samsung.com> > */ Use C++ comments.
Hi Mark, On Thu, Dec 14, 2017 at 11:41 AM, Mark Brown <broonie@kernel.org> wrote: > On Thu, Dec 14, 2017 at 10:31:09AM +0900, Andi Shyti wrote: > >> 1. Strictly by Thomas documentation: >> >> /* SPDX-License-Identifier: GPL-2.0 */ >> >> /* >> * Copyright (C) 2009 Samsung Electronics Ltd. >> * Jaswinder Singh <jassi.brar@samsung.com> >> */ > > Use C++ comments. Not for header files... https://www.spinics.net/lists/linux-xfs/msg12872.html Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index de7df20f8712..baa3a9fa2638 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c @@ -1,17 +1,7 @@ -/* - * Copyright (C) 2009 Samsung Electronics Ltd. - * Jaswinder Singh <jassi.brar@samsung.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. - */ +// SPDX-License-Identifier: GPL-2.0+ +// +// Copyright (c) 2009 Samsung Electronics Co., Ltd. +// Jaswinder Singh <jassi.brar@samsung.com> #include <linux/init.h> #include <linux/module.h> diff --git a/include/linux/platform_data/spi-s3c64xx.h b/include/linux/platform_data/spi-s3c64xx.h index da79774078a7..8917f38c97c5 100644 --- a/include/linux/platform_data/spi-s3c64xx.h +++ b/include/linux/platform_data/spi-s3c64xx.h @@ -2,9 +2,7 @@ * Copyright (C) 2009 Samsung Electronics Ltd. * Jaswinder Singh <jassi.brar@samsung.com> * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * SPDX-License-Identifier: GPL-2.0 */ #ifndef __SPI_S3C64XX_H
Replace the original license statement with the SPDX identifier. Signed-off-by: Andi Shyti <andi.shyti@samsung.com> --- Hi, this second version unlike v1, where I tried to move the license from GPLv2+ to GPLv2, preserves the original licese while adding the SPDX identifier. Andi drivers/spi/spi-s3c64xx.c | 18 ++++-------------- include/linux/platform_data/spi-s3c64xx.h | 4 +--- 2 files changed, 5 insertions(+), 17 deletions(-)