Currently sas_task.c has no license specifier, so add SPDX license
identifier for GPL-2.0+.
As mentioned in commit b24413180f56 ("License cleanup: add SPDX GPL-2.0
license identifier to files with no license"), files with no license in
the kernel are under default kernel license.
While I'm at it, all other libsas source code files are updated to use
SPDX license identifier for GPL-2.0+.
Signed-off-by: John Garry <[email protected]>
diff --git a/drivers/scsi/libsas/Kconfig b/drivers/scsi/libsas/Kconfig
index 13739bfa..bdc6bce 100644
--- a/drivers/scsi/libsas/Kconfig
+++ b/drivers/scsi/libsas/Kconfig
@@ -4,22 +4,7 @@
# Copyright (C) 2005 Adaptec, Inc. All rights reserved.
# Copyright (C) 2005 Luben Tuikov <[email protected]>
#
-# This file is licensed under GPLv2.
-#
-# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
+# SPDX-License-Identifier: GPL-2.0+
#
config SCSI_SAS_LIBSAS
diff --git a/drivers/scsi/libsas/Makefile b/drivers/scsi/libsas/Makefile
index 5d51520..75998b7 100644
--- a/drivers/scsi/libsas/Makefile
+++ b/drivers/scsi/libsas/Makefile
@@ -4,22 +4,7 @@
# Copyright (C) 2005 Adaptec, Inc. All rights reserved.
# Copyright (C) 2005 Luben Tuikov <[email protected]>
#
-# This file is licensed under GPLv2.
-#
-# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
+# SPDX-License-Identifier: GPL-2.0+
obj-$(CONFIG_SCSI_SAS_LIBSAS) += libsas.o
libsas-y += sas_init.o \
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
index daf898c..43e5377 100644
--- a/drivers/scsi/libsas/sas_ata.c
+++ b/drivers/scsi/libsas/sas_ata.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Support for SATA devices on Serial Attached SCSI (SAS) controllers
*
@@ -5,20 +6,6 @@
*
* Written by: Darrick J. Wong <[email protected]>, IBM Corporation
*
- * 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.
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
*/
#include <linux/scatterlist.h>
diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c
index 726ada9..43db4ec 100644
--- a/drivers/scsi/libsas/sas_discover.c
+++ b/drivers/scsi/libsas/sas_discover.c
@@ -1,25 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Serial Attached SCSI (SAS) Discover process
*
* Copyright (C) 2005 Adaptec, Inc. All rights reserved.
* Copyright (C) 2005 Luben Tuikov <[email protected]>
*
- * This file is licensed under GPLv2.
- *
- * 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.
- *
- * 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/scatterlist.h>
diff --git a/drivers/scsi/libsas/sas_event.c b/drivers/scsi/libsas/sas_event.c
index b1e0f7d..b7d2a8b 100644
--- a/drivers/scsi/libsas/sas_event.c
+++ b/drivers/scsi/libsas/sas_event.c
@@ -1,25 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Serial Attached SCSI (SAS) Event processing
*
* Copyright (C) 2005 Adaptec, Inc. All rights reserved.
* Copyright (C) 2005 Luben Tuikov <[email protected]>
*
- * This file is licensed under GPLv2.
- *
- * 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.
- *
- * 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/export.h>
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c
index 17eb418..fbec655 100644
--- a/drivers/scsi/libsas/sas_expander.c
+++ b/drivers/scsi/libsas/sas_expander.c
@@ -1,25 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Serial Attached SCSI (SAS) Expander discovery and configuration
*
* Copyright (C) 2005 Adaptec, Inc. All rights reserved.
* Copyright (C) 2005 Luben Tuikov <[email protected]>
*
- * This file is licensed under GPLv2.
- *
- * 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.
- *
- * 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/scatterlist.h>
diff --git a/drivers/scsi/libsas/sas_host_smp.c b/drivers/scsi/libsas/sas_host_smp.c
index 9ead93d..253ba3b 100644
--- a/drivers/scsi/libsas/sas_host_smp.c
+++ b/drivers/scsi/libsas/sas_host_smp.c
@@ -1,12 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0
/*
* Serial Attached SCSI (SAS) Expander discovery and configuration
*
* Copyright (C) 2007 James E.J. Bottomley
* <[email protected]>
*
- * 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 only.
*/
#include <linux/scatterlist.h>
#include <linux/blkdev.h>
diff --git a/drivers/scsi/libsas/sas_init.c b/drivers/scsi/libsas/sas_init.c
index 221340e..11be84b 100644
--- a/drivers/scsi/libsas/sas_init.c
+++ b/drivers/scsi/libsas/sas_init.c
@@ -1,26 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Serial Attached SCSI (SAS) Transport Layer initialization
*
* Copyright (C) 2005 Adaptec, Inc. All rights reserved.
* Copyright (C) 2005 Luben Tuikov <[email protected]>
*
- * This file is licensed under GPLv2.
- *
- * 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.
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- *
*/
#include <linux/module.h>
diff --git a/drivers/scsi/libsas/sas_internal.h b/drivers/scsi/libsas/sas_internal.h
index 2cdb981..e4a2ec1 100644
--- a/drivers/scsi/libsas/sas_internal.h
+++ b/drivers/scsi/libsas/sas_internal.h
@@ -1,26 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Serial Attached SCSI (SAS) class internal header file
*
* Copyright (C) 2005 Adaptec, Inc. All rights reserved.
* Copyright (C) 2005 Luben Tuikov <[email protected]>
*
- * This file is licensed under GPLv2.
- *
- * 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.
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- *
*/
#ifndef _SAS_INTERNAL_H_
diff --git a/drivers/scsi/libsas/sas_phy.c b/drivers/scsi/libsas/sas_phy.c
index 0374243..bbe3b65 100644
--- a/drivers/scsi/libsas/sas_phy.c
+++ b/drivers/scsi/libsas/sas_phy.c
@@ -1,25 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Serial Attached SCSI (SAS) Phy class
*
* Copyright (C) 2005 Adaptec, Inc. All rights reserved.
* Copyright (C) 2005 Luben Tuikov <[email protected]>
*
- * This file is licensed under GPLv2.
- *
- * 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.
- *
- * 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 "sas_internal.h"
diff --git a/drivers/scsi/libsas/sas_port.c b/drivers/scsi/libsas/sas_port.c
index 03fe479..bcd9ac4 100644
--- a/drivers/scsi/libsas/sas_port.c
+++ b/drivers/scsi/libsas/sas_port.c
@@ -1,25 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Serial Attached SCSI (SAS) Port class
*
* Copyright (C) 2005 Adaptec, Inc. All rights reserved.
* Copyright (C) 2005 Luben Tuikov <[email protected]>
*
- * This file is licensed under GPLv2.
- *
- * 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.
- *
- * 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 "sas_internal.h"
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c
index 674789b..0b68ecd 100644
--- a/drivers/scsi/libsas/sas_scsi_host.c
+++ b/drivers/scsi/libsas/sas_scsi_host.c
@@ -1,26 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
/*
* Serial Attached SCSI (SAS) class SCSI Host glue.
*
* Copyright (C) 2005 Adaptec, Inc. All rights reserved.
* Copyright (C) 2005 Luben Tuikov <[email protected]>
*
- * This file is licensed under GPLv2.
- *
- * 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.
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- *
*/
#include <linux/kthread.h>
diff --git a/drivers/scsi/libsas/sas_task.c b/drivers/scsi/libsas/sas_task.c
index c3b9bef..3adc5c3 100644
--- a/drivers/scsi/libsas/sas_task.c
+++ b/drivers/scsi/libsas/sas_task.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0+
#include "sas_internal.h"
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index 3de3b10..8ab2424 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -1,26 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* SAS host prototypes and structures header file
*
* Copyright (C) 2005 Adaptec, Inc. All rights reserved.
* Copyright (C) 2005 Luben Tuikov <[email protected]>
*
- * This file is licensed under GPLv2.
- *
- * 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.
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- *
*/
#ifndef _LIBSAS_H_
diff --git a/include/scsi/sas.h b/include/scsi/sas.h
index 42a84ef..788d0f2 100644
--- a/include/scsi/sas.h
+++ b/include/scsi/sas.h
@@ -1,26 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* SAS structures and definitions header file
*
* Copyright (C) 2005 Adaptec, Inc. All rights reserved.
* Copyright (C) 2005 Luben Tuikov <[email protected]>
*
- * This file is licensed under GPLv2.
- *
- * 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.
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- *
*/
#ifndef _SAS_H_
diff --git a/include/scsi/sas_ata.h b/include/scsi/sas_ata.h
index 00f41ae..1a6163a 100644
--- a/include/scsi/sas_ata.h
+++ b/include/scsi/sas_ata.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Support for SATA devices on Serial Attached SCSI (SAS) controllers
*
@@ -5,21 +6,6 @@
*
* Written by: Darrick J. Wong <[email protected]>, IBM Corporation
*
- * 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.
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
- *
*/
#ifndef _SAS_ATA_H_
--
1.9.1
On Tue, Nov 27, 2018 at 10:15:32PM +0800, John Garry wrote:
> Currently sas_task.c has no license specifier, so add SPDX license
> identifier for GPL-2.0+.
>
> As mentioned in commit b24413180f56 ("License cleanup: add SPDX GPL-2.0
> license identifier to files with no license"), files with no license in
> the kernel are under default kernel license.
The default is GPLv2, not v2+.
>
> While I'm at it, all other libsas source code files are updated to use
> SPDX license identifier for GPL-2.0+.
>
> Signed-off-by: John Garry <[email protected]>
>
> diff --git a/drivers/scsi/libsas/Kconfig b/drivers/scsi/libsas/Kconfig
> index 13739bfa..bdc6bce 100644
> --- a/drivers/scsi/libsas/Kconfig
> +++ b/drivers/scsi/libsas/Kconfig
> @@ -4,22 +4,7 @@
> # Copyright (C) 2005 Adaptec, Inc. All rights reserved.
> # Copyright (C) 2005 Luben Tuikov <[email protected]>
> #
> -# This file is licensed under GPLv2.
> -#
> -# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
> -# USA
> +# SPDX-License-Identifier: GPL-2.0+
No, the above license is GPLv2 only, do NOT change the license of a file
unless you have permission to do so.
Also, the spdx line goes at the first line of the file.
> #
>
> config SCSI_SAS_LIBSAS
> diff --git a/drivers/scsi/libsas/Makefile b/drivers/scsi/libsas/Makefile
> index 5d51520..75998b7 100644
> --- a/drivers/scsi/libsas/Makefile
> +++ b/drivers/scsi/libsas/Makefile
> @@ -4,22 +4,7 @@
> # Copyright (C) 2005 Adaptec, Inc. All rights reserved.
> # Copyright (C) 2005 Luben Tuikov <[email protected]>
> #
> -# This file is licensed under GPLv2.
> -#
> -# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
> -# USA
> +# SPDX-License-Identifier: GPL-2.0+
Again you changed the license, not good :(
Please do not make these types of changes unless you really know what
you are doing, it is not ok to change the license of files.
greg k-h
On 27/11/2018 14:43, Greg KH wrote:
Hi Greg,
> On Tue, Nov 27, 2018 at 10:15:32PM +0800, John Garry wrote:
>> Currently sas_task.c has no license specifier, so add SPDX license
>> identifier for GPL-2.0+.
>>
>> As mentioned in commit b24413180f56 ("License cleanup: add SPDX GPL-2.0
>> license identifier to files with no license"), files with no license in
>> the kernel are under default kernel license.
>
> The default is GPLv2, not v2+.
So sas_task.c should be v2.
>
>>
>> While I'm at it, all other libsas source code files are updated to use
>> SPDX license identifier for GPL-2.0+.
>>
>> Signed-off-by: John Garry <[email protected]>
>>
>> diff --git a/drivers/scsi/libsas/Kconfig b/drivers/scsi/libsas/Kconfig
>> index 13739bfa..bdc6bce 100644
>> --- a/drivers/scsi/libsas/Kconfig
>> +++ b/drivers/scsi/libsas/Kconfig
>> @@ -4,22 +4,7 @@
>> # Copyright (C) 2005 Adaptec, Inc. All rights reserved.
>> # Copyright (C) 2005 Luben Tuikov <[email protected]>
>> #
>> -# This file is licensed under GPLv2.
>> -#
>> -# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
>> -# USA
>> +# SPDX-License-Identifier: GPL-2.0+
>
> No, the above license is GPLv2 only, do NOT change the license of a file
> unless you have permission to do so.
Of course. That was not my intention. My mistake.
>
> Also, the spdx line goes at the first line of the file.
JFYI, checkpatch.pl does pick up on this for .c/.h files but not this one.
>
>
>> #
>>
>> config SCSI_SAS_LIBSAS
>> diff --git a/drivers/scsi/libsas/Makefile b/drivers/scsi/libsas/Makefile
>> index 5d51520..75998b7 100644
>> --- a/drivers/scsi/libsas/Makefile
>> +++ b/drivers/scsi/libsas/Makefile
>> @@ -4,22 +4,7 @@
>> # Copyright (C) 2005 Adaptec, Inc. All rights reserved.
>> # Copyright (C) 2005 Luben Tuikov <[email protected]>
>> #
>> -# This file is licensed under GPLv2.
>> -#
>> -# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
>> -# USA
>> +# SPDX-License-Identifier: GPL-2.0+
>
> Again you changed the license, not good :(
I was thrown by having a different license for the Kconfig+Makefile vs
.c/.h.
>
> Please do not make these types of changes unless you really know what
> you are doing, it is not ok to change the license of files.
Right, of course.
>
> greg k-h
>
Thanks, I'll fix them properly,
John
On 27/11/2018 15:23, John Garry wrote:
> On 27/11/2018 14:43, Greg KH wrote:
>
> Hi Greg,
>
>> On Tue, Nov 27, 2018 at 10:15:32PM +0800, John Garry wrote:
>>> Currently sas_task.c has no license specifier, so add SPDX license
>>> identifier for GPL-2.0+.
>>>
>>> As mentioned in commit b24413180f56 ("License cleanup: add SPDX GPL-2.0
>>> license identifier to files with no license"), files with no license in
>>> the kernel are under default kernel license.
>>
>> The default is GPLv2, not v2+.
>
> So sas_task.c should be v2.
Hi Greg,
I also note that currently we have an inconsistency in license of
sas_init.c:
/*
* Serial Attached SCSI (SAS) Transport Layer initialization
*
* Copyright (C) 2005 Adaptec, Inc. All rights reserved.
* Copyright (C) 2005 Luben Tuikov <[email protected]>
*
* This file is licensed under GPLv2.
*
* 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.
*
* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
* USA
*
*/
...
MODULE_AUTHOR("Luben Tuikov <[email protected]>");
MODULE_DESCRIPTION("SAS Transport Layer");
MODULE_LICENSE("GPL v2");
So the license specifies v2+ but module license states v2.
I could not find a docment for guidance on this. I also note that making
sas_task.c v2 would mean mixing v2 and v2+ into the module.
I did find an example of someone changing the license:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/drivers/i2c/busses/i2c-designware-slave.c?h=v4.20-rc4&id=15c566fcff9cc7b8fd64461d6ee6fd1bc665b444
Then someone changes the module license (but same company):
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/sound/soc/sh/rcar/core.c?h=v4.20-rc4&id=1e0edd4deadbbacd3b35179c233efa26624ab2af
At this point I'm reluctant to touch this in case I mess up, but there
is still the missing license in sas_task.c .
Thanks,
John
>
>>
>>>
>>> While I'm at it, all other libsas source code files are updated to use
>>> SPDX license identifier for GPL-2.0+.
>>>
>>> Signed-off-by: John Garry <[email protected]>
>>>
>>> diff --git a/drivers/scsi/libsas/Kconfig b/drivers/scsi/libsas/Kconfig
>>> index 13739bfa..bdc6bce 100644
>>> --- a/drivers/scsi/libsas/Kconfig
>>> +++ b/drivers/scsi/libsas/Kconfig
>>> @@ -4,22 +4,7 @@
>>> # Copyright (C) 2005 Adaptec, Inc. All rights reserved.
>>> # Copyright (C) 2005 Luben Tuikov <[email protected]>
>>> #
>>> -# This file is licensed under GPLv2.
>>> -#
>>> -# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
>>> -# USA
>>> +# SPDX-License-Identifier: GPL-2.0+
>>
>> No, the above license is GPLv2 only, do NOT change the license of a file
>> unless you have permission to do so.
>
> Of course. That was not my intention. My mistake.
>
>>
>> Also, the spdx line goes at the first line of the file.
>
> JFYI, checkpatch.pl does pick up on this for .c/.h files but not this one.
>
>>
>>
>>> #
>>>
>>> config SCSI_SAS_LIBSAS
>>> diff --git a/drivers/scsi/libsas/Makefile b/drivers/scsi/libsas/Makefile
>>> index 5d51520..75998b7 100644
>>> --- a/drivers/scsi/libsas/Makefile
>>> +++ b/drivers/scsi/libsas/Makefile
>>> @@ -4,22 +4,7 @@
>>> # Copyright (C) 2005 Adaptec, Inc. All rights reserved.
>>> # Copyright (C) 2005 Luben Tuikov <[email protected]>
>>> #
>>> -# This file is licensed under GPLv2.
>>> -#
>>> -# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
>>> -# USA
>>> +# SPDX-License-Identifier: GPL-2.0+
>>
>> Again you changed the license, not good :(
>
> I was thrown by having a different license for the Kconfig+Makefile vs
> .c/.h.
>
>>
>> Please do not make these types of changes unless you really know what
>> you are doing, it is not ok to change the license of files.
>
> Right, of course.
>
>>
>> greg k-h
>>
>
> Thanks, I'll fix them properly,
> John
>
>
>
>
> .
>
On Thu, Nov 29, 2018 at 11:52:39AM +0000, John Garry wrote:
> On 27/11/2018 15:23, John Garry wrote:
> > On 27/11/2018 14:43, Greg KH wrote:
> >
> > Hi Greg,
> >
> > > On Tue, Nov 27, 2018 at 10:15:32PM +0800, John Garry wrote:
> > > > Currently sas_task.c has no license specifier, so add SPDX license
> > > > identifier for GPL-2.0+.
> > > >
> > > > As mentioned in commit b24413180f56 ("License cleanup: add SPDX GPL-2.0
> > > > license identifier to files with no license"), files with no license in
> > > > the kernel are under default kernel license.
> > >
> > > The default is GPLv2, not v2+.
> >
> > So sas_task.c should be v2.
>
> Hi Greg,
>
> I also note that currently we have an inconsistency in license of
> sas_init.c:
>
> /*
> * Serial Attached SCSI (SAS) Transport Layer initialization
> *
> * Copyright (C) 2005 Adaptec, Inc. All rights reserved.
> * Copyright (C) 2005 Luben Tuikov <[email protected]>
> *
> * This file is licensed under GPLv2.
> *
> * 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.
> *
> * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
> * USA
> *
> */
>
> ...
>
> MODULE_AUTHOR("Luben Tuikov <[email protected]>");
> MODULE_DESCRIPTION("SAS Transport Layer");
> MODULE_LICENSE("GPL v2");
>
> So the license specifies v2+ but module license states v2.
>
> I could not find a docment for guidance on this. I also note that making
> sas_task.c v2 would mean mixing v2 and v2+ into the module.
This is not the only file in the kernel with this problem.
For now, we have been trusting the "written text" lines over the
MODULE_LICENSE() lines, as that seems to be the proper way forward.
> I did find an example of someone changing the license:
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/drivers/i2c/busses/i2c-designware-slave.c?h=v4.20-rc4&id=15c566fcff9cc7b8fd64461d6ee6fd1bc665b444
>
Yup, not good, that should be fixed.
> Then someone changes the module license (but same company):
> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/sound/soc/sh/rcar/core.c?h=v4.20-rc4&id=1e0edd4deadbbacd3b35179c233efa26624ab2af
That should be fine, the text says the correct one.
> At this point I'm reluctant to touch this in case I mess up, but there is
> still the missing license in sas_task.c .
Don't touch things like this unless you know _EXACTLY_ what you are
doing...
good luck!
greg k-h
On Thu, Nov 29, 2018 at 01:11:10PM +0100, Greg KH wrote:
> On Thu, Nov 29, 2018 at 11:52:39AM +0000, John Garry wrote:
> > On 27/11/2018 15:23, John Garry wrote:
> > > On 27/11/2018 14:43, Greg KH wrote:
> > >
> > > Hi Greg,
> > >
> > > > On Tue, Nov 27, 2018 at 10:15:32PM +0800, John Garry wrote:
> > > > > Currently sas_task.c has no license specifier, so add SPDX license
> > > > > identifier for GPL-2.0+.
> > > > >
> > > > > As mentioned in commit b24413180f56 ("License cleanup: add SPDX GPL-2.0
> > > > > license identifier to files with no license"), files with no license in
> > > > > the kernel are under default kernel license.
> > > >
> > > > The default is GPLv2, not v2+.
> > >
> > > So sas_task.c should be v2.
> >
> > Hi Greg,
> >
> > I also note that currently we have an inconsistency in license of
> > sas_init.c:
> >
> > /*
> > * Serial Attached SCSI (SAS) Transport Layer initialization
> > *
> > * Copyright (C) 2005 Adaptec, Inc. All rights reserved.
> > * Copyright (C) 2005 Luben Tuikov <[email protected]>
> > *
> > * This file is licensed under GPLv2.
> > *
> > * 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.
> > *
> > * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
> > * USA
> > *
> > */
> >
> > ...
> >
> > MODULE_AUTHOR("Luben Tuikov <[email protected]>");
> > MODULE_DESCRIPTION("SAS Transport Layer");
> > MODULE_LICENSE("GPL v2");
> >
> > So the license specifies v2+ but module license states v2.
> >
> > I could not find a docment for guidance on this. I also note that making
> > sas_task.c v2 would mean mixing v2 and v2+ into the module.
>
> This is not the only file in the kernel with this problem.
>
> For now, we have been trusting the "written text" lines over the
> MODULE_LICENSE() lines, as that seems to be the proper way forward.
>
> > I did find an example of someone changing the license:
> > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/drivers/i2c/busses/i2c-designware-slave.c?h=v4.20-rc4&id=15c566fcff9cc7b8fd64461d6ee6fd1bc665b444
> >
>
> Yup, not good, that should be fixed.
I take it back, the changelog for the patch explains what is happening
here, the people involved were paying attention.
greg k-h
On 29/11/2018 12:13, Greg KH wrote:
>>> ...
>>> > >
>>> > > MODULE_AUTHOR("Luben Tuikov <[email protected]>");
>>> > > MODULE_DESCRIPTION("SAS Transport Layer");
>>> > > MODULE_LICENSE("GPL v2");
>>> > >
>>> > > So the license specifies v2+ but module license states v2.
>>> > >
>>> > > I could not find a docment for guidance on this. I also note that making
>>> > > sas_task.c v2 would mean mixing v2 and v2+ into the module.
>> >
>> > This is not the only file in the kernel with this problem.
>> >
>> > For now, we have been trusting the "written text" lines over the
>> > MODULE_LICENSE() lines, as that seems to be the proper way forward.
>> >
>>> > > I did find an example of someone changing the license:
>>> > > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/drivers/i2c/busses/i2c-designware-slave.c?h=v4.20-rc4&id=15c566fcff9cc7b8fd64461d6ee6fd1bc665b444
>>> > >
>> >
>> > Yup, not good, that should be fixed.
> I take it back, the changelog for the patch explains what is happening
> here, the people involved were paying attention.
>
OK, but these sample patches were just some I selected at random. May be
many more (incorrect)...
Cheers,
John
> greg k-h
>
> .
>
On Thu, 2018-11-29 at 11:52 +0000, John Garry wrote:
[...]
> Hi Greg,
>
> I also note that currently we have an inconsistency in license of
> sas_init.c:
>
> /*
> * Serial Attached SCSI (SAS) Transport Layer initialization
> *
> * Copyright (C) 2005 Adaptec, Inc. All rights reserved.
> * Copyright (C) 2005 Luben Tuikov <[email protected]>
> *
> * This file is licensed under GPLv2.
> *
> * 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.
> *
> * 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., 59 Temple Place, Suite 330, Boston, MA 02111-
> 1307
> * USA
> *
> */
>
> ...
>
> MODULE_AUTHOR("Luben Tuikov <[email protected]>");
> MODULE_DESCRIPTION("SAS Transport Layer");
> MODULE_LICENSE("GPL v2");
>
> So the license specifies v2+ but module license states v2.
>
> I could not find a docment for guidance on this. I also note that
> making sas_task.c v2 would mean mixing v2 and v2+ into the module.
The point here is to get help. There are three pieces of evidence in
the file one for v2+ and two for v2. So you can look in the git tree
to when it was actually contributed:
commit 2908d778ab3e244900c310974e1fc1c69066e450
Author: James Bottomley <[email protected]>
Date: Tue Aug 29 09:22:51 2006 -0500
[SCSI] aic94xx: new driver
and if you ask the original contributor he can tell you the original
intent was v2 only. If you want to modify all the files in libsas and
aic9xxx to have that SPDX tag.
> At this point I'm reluctant to touch this in case I mess up, but
> there is still the missing license in sas_task.c .
Again, the tree will tell you. In this case it's
commit 366ca51f30de1cbb5b356c70b7bb22051c558e41
Author: James Bottomley <[email protected]>
Date: Fri Jan 18 10:47:01 2008 -0600
[SCSI] libsas: abstract STP task status into a function
So that file is a direct extraction from an existing v2 only file in
aic9xxx, so it's licence is also v2 only.
James
On 29/11/2018 15:49, James Bottomley wrote:
> On Thu, 2018-11-29 at 11:52 +0000, John Garry wrote:
> [...]
>> Hi Greg,
>>
>> I also note that currently we have an inconsistency in license of
>> sas_init.c:
>>
>> /*
>> * Serial Attached SCSI (SAS) Transport Layer initialization
>> *
>> * Copyright (C) 2005 Adaptec, Inc. All rights reserved.
>> * Copyright (C) 2005 Luben Tuikov <[email protected]>
>> *
>> * This file is licensed under GPLv2.
>> *
>> * 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.
>> *
>> * 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., 59 Temple Place, Suite 330, Boston, MA 02111-
>> 1307
>> * USA
>> *
>> */
>>
>> ...
>>
>> MODULE_AUTHOR("Luben Tuikov <[email protected]>");
>> MODULE_DESCRIPTION("SAS Transport Layer");
>> MODULE_LICENSE("GPL v2");
>>
>> So the license specifies v2+ but module license states v2.
>>
>> I could not find a docment for guidance on this. I also note that
>> making sas_task.c v2 would mean mixing v2 and v2+ into the module.
>
> The point here is to get help. There are three pieces of evidence in
> the file one for v2+ and two for v2. So you can look in the git tree
> to when it was actually contributed:
>
> commit 2908d778ab3e244900c310974e1fc1c69066e450
> Author: James Bottomley <[email protected]>
> Date: Tue Aug 29 09:22:51 2006 -0500
>
> [SCSI] aic94xx: new driver
>
> and if you ask the original contributor he can tell you the original
> intent was v2 only.If you want to modify all the files in libsas and
> aic9xxx to have that SPDX tag.
Right, so that would involve modifying the licenses of the currently v2+
libsas files. aic9xx source files are v2 already.
>
>> At this point I'm reluctant to touch this in case I mess up, but
>> there is still the missing license in sas_task.c .
>
> Again, the tree will tell you. In this case it's
>
> commit 366ca51f30de1cbb5b356c70b7bb22051c558e41
> Author: James Bottomley <[email protected]>
> Date: Fri Jan 18 10:47:01 2008 -0600
>
> [SCSI] libsas: abstract STP task status into a function
>
> So that file is a direct extraction from an existing v2 only file in
> aic9xxx, so it's licence is also v2 only.
ok
Thanks,
John
>
> James
>
>
> .
>