2019-05-01 16:17:14

by Christoph Hellwig

[permalink] [raw]
Subject: [PATCH 21/24] sg: switch to SPDX tags

Use the the GPLv2+ SPDX tag instead of verbose boilerplate text.

Signed-off-by: Christoph Hellwig <[email protected]>
---
drivers/scsi/sg.c | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index d3f15319b9b3..bcdc28e5ede7 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* History:
* Started: Aug 9 by Lawrence Foard ([email protected]),
@@ -8,12 +9,6 @@
* Copyright (C) 1992 Lawrence Foard
* Version 2 and 3 extensions to driver:
* Copyright (C) 1998 - 2014 Douglas Gilbert
- *
- * 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, or (at your option)
- * any later version.
- *
*/

static int sg_version_num = 30536; /* 2 digits for each component */
--
2.20.1


2019-05-02 06:08:09

by Hannes Reinecke

[permalink] [raw]
Subject: Re: [PATCH 21/24] sg: switch to SPDX tags

On 5/1/19 6:14 PM, Christoph Hellwig wrote:
> Use the the GPLv2+ SPDX tag instead of verbose boilerplate text.
>
> Signed-off-by: Christoph Hellwig <[email protected]>
> ---
> drivers/scsi/sg.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
> index d3f15319b9b3..bcdc28e5ede7 100644
> --- a/drivers/scsi/sg.c
> +++ b/drivers/scsi/sg.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0+
> /*
> * History:
> * Started: Aug 9 by Lawrence Foard ([email protected]),
> @@ -8,12 +9,6 @@
> * Copyright (C) 1992 Lawrence Foard
> * Version 2 and 3 extensions to driver:
> * Copyright (C) 1998 - 2014 Douglas Gilbert
> - *
> - * 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, or (at your option)
> - * any later version.
> - *
> */
>
> static int sg_version_num = 30536; /* 2 digits for each component */
>
Reviewed-by: Hannes Reinecke <[email protected]>

Cheers,

Hannes
--
Dr. Hannes Reinecke Teamlead Storage & Networking
[email protected] +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Mary Higgins, Sri Rasiah
HRB 21284 (AG Nürnberg)

2019-05-02 15:44:36

by Douglas Gilbert

[permalink] [raw]
Subject: Re: [PATCH 21/24] sg: switch to SPDX tags

On 2019-05-01 6:14 p.m., Christoph Hellwig wrote:
> Use the the GPLv2+ SPDX tag instead of verbose boilerplate text.

IOWs replace 3.5 lines with 1.

>
> Signed-off-by: Christoph Hellwig <[email protected]>

Acked-by: Douglas Gilbert <[email protected]>

> ---
> drivers/scsi/sg.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
> index d3f15319b9b3..bcdc28e5ede7 100644
> --- a/drivers/scsi/sg.c
> +++ b/drivers/scsi/sg.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0+
> /*
> * History:
> * Started: Aug 9 by Lawrence Foard ([email protected]),
> @@ -8,12 +9,6 @@
> * Copyright (C) 1992 Lawrence Foard
> * Version 2 and 3 extensions to driver:
> * Copyright (C) 1998 - 2014 Douglas Gilbert
> - *
> - * 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, or (at your option)
> - * any later version.
> - *
> */
>
> static int sg_version_num = 30536; /* 2 digits for each component */
>

2019-05-05 20:07:13

by Douglas Gilbert

[permalink] [raw]
Subject: Re: [PATCH 21/24] sg: switch to SPDX tags

On 2019-05-01 6:14 p.m., Christoph Hellwig wrote:
> Use the the GPLv2+ SPDX tag instead of verbose boilerplate text.
>
> Signed-off-by: Christoph Hellwig <[email protected]>

This scripts/checkpatch.pl noise seems to be related to the patch below:

$ scripts/checkpatch.pl /tmp/t.patch
Traceback (most recent call last):
File "scripts/spdxcheck.py", line 6, in <module>
from ply import lex, yacc
ImportError: No module named ply
total: 0 errors, 0 warnings, 98 lines checked

That happens both in the mkp/scsi/5.2/scsi-queue and the latest linux-stable
trees.


BTW Are C++ comments (as used in this patch) now permitted in lk code?

Doug Gilbert

> ---
> drivers/scsi/sg.c | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
> index d3f15319b9b3..bcdc28e5ede7 100644
> --- a/drivers/scsi/sg.c
> +++ b/drivers/scsi/sg.c
> @@ -1,3 +1,4 @@
> +// SPDX-License-Identifier: GPL-2.0+
> /*
> * History:
> * Started: Aug 9 by Lawrence Foard ([email protected]),
> @@ -8,12 +9,6 @@
> * Copyright (C) 1992 Lawrence Foard
> * Version 2 and 3 extensions to driver:
> * Copyright (C) 1998 - 2014 Douglas Gilbert
> - *
> - * 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, or (at your option)
> - * any later version.
> - *
> */
>
> static int sg_version_num = 30536; /* 2 digits for each component */
>