From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Garry Subject: Re: [PATCH] scsi: libsas: Add missing license and update to SPDX license identifier Date: Tue, 27 Nov 2018 15:23:24 +0000 Message-ID: <8ae3a984-b4d4-f2eb-4aaa-b460441fa403@huawei.com> References: <1543328132-243266-1-git-send-email-john.garry@huawei.com> <20181127144333.GA11004@kroah.com> Mime-Version: 1.0 Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20181127144333.GA11004@kroah.com> Sender: linux-kernel-owner@vger.kernel.org To: Greg KH Cc: jejb@linux.vnet.ibm.com, martin.petersen@oracle.com, linuxarm@huawei.com, linux-kernel@vger.kernel.org, linux-scsi@vger.kernel.org List-Id: linux-scsi@vger.kernel.org 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 >> >> 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 >> # >> -# 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 >> # >> -# 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