Re: [RESEND PATCH v2 2/7] nfc: nci: replace GPLv2 boilerplate with SPDX

Re: [RESEND PATCH v2 2/7] nfc: nci: replace GPLv2 boilerplate with SPDX

[Krzysztof Kozlowski]

[-- Attachment #1: Type: text/plain, Size: 1280 bytes --]

On 08/10/2021 12:33, Joe Perches wrote:
> On Thu, 2021-10-07 at 15:30 +0200, Krzysztof Kozlowski wrote:
>> Replace standard GPLv2 only license text with SPDX tag.
> 
> Nak
> 
> This is actually licenced with GPL-2.0-or-later
> 
>> diff --git a/net/nfc/nci/uart.c b/net/nfc/nci/uart.c
> []
>> @@ -1,20 +1,8 @@
>> +// SPDX-License-Identifier: GPL-2.0
> []
> You may use, redistribute and/or modify this File in
>> - * accordance with the terms and conditions of the License, a copy of which
>> - * is available on the worldwide web at
>> - * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
> 
> See the actual text at the old link which includes:
> 
>     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.


Thanks Joe for checking this. Isn't this conflicting with first
paragraph in the source file:

  This software file (the "File") is distributed by Marvell
InternationalLtd. under the terms of the GNU General Public License
Version 2, June 1991(the "License").

This part does not specify "or later".

Best regards,
Krzysztof

[RESEND PATCH v2 2/7] nfc: nci: replace GPLv2 boilerplate with SPDX

[Krzysztof Kozlowski]

[-- Attachment #1: Type: text/plain, Size: 1456 bytes --]

Replace standard GPLv2 only license text with SPDX tag.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
 net/nfc/nci/uart.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/net/nfc/nci/uart.c b/net/nfc/nci/uart.c
index 9bdd9a7d187e..9f7bae51404e 100644
--- a/net/nfc/nci/uart.c
+++ b/net/nfc/nci/uart.c
@@ -1,20 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * Copyright (C) 2015, Marvell International Ltd.
  *
- * This software file (the "File") is distributed by Marvell International
- * Ltd. under the terms of the GNU General Public License Version 2, June 1991
- * (the "License").  You may use, redistribute and/or modify this File in
- * accordance with the terms and conditions of the License, a copy of which
- * is available on the worldwide web at
- * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
- *
- * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE
- * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about
- * this warranty disclaimer.
- */
-
-/* Inspired (hugely) by HCI LDISC implementation in Bluetooth.
+ * Inspired (hugely) by HCI LDISC implementation in Bluetooth.
  *
  *  Copyright (C) 2000-2001  Qualcomm Incorporated
  *  Copyright (C) 2002-2003  Maxim Krasnyansky <maxk@qualcomm.com>
-- 
2.30.2