zram_drv lacks an SPDX license identifier in both its source and in its
header, so we should add license identifiers based on the copyright info
provided by the initial comment block.
Signed-off-by: Miko Larsson <[email protected]>
---
drivers/block/zram/zram_drv.c | 9 ++-------
drivers/block/zram/zram_drv.h | 9 ++-------
2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 25071126995b..4de6fe13edaf 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -1,15 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
+
/*
* Compressed RAM block device
*
* Copyright (C) 2008, 2009, 2010 Nitin Gupta
* 2012, 2013 Minchan Kim
- *
- * This code is released using a dual license strategy: BSD/GPL
- * You can choose the licence that better fits your requirements.
- *
- * Released under the terms of 3-clause BSD License
- * Released under the terms of GNU General Public License Version 2.0
- *
*/
#define KMSG_COMPONENT "zram"
diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h
index 80c3b43b4828..29e75e094a9d 100644
--- a/drivers/block/zram/zram_drv.h
+++ b/drivers/block/zram/zram_drv.h
@@ -1,15 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause */
+
/*
* Compressed RAM block device
*
* Copyright (C) 2008, 2009, 2010 Nitin Gupta
* 2012, 2013 Minchan Kim
- *
- * This code is released using a dual license strategy: BSD/GPL
- * You can choose the licence that better fits your requirements.
- *
- * Released under the terms of 3-clause BSD License
- * Released under the terms of GNU General Public License Version 2.0
- *
*/
#ifndef _ZRAM_DRV_H_
--
2.34.1
On Fri, Dec 17, 2021 at 07:32:23AM +0100, Miko Larsson wrote:
> zram_drv lacks an SPDX license identifier in both its source and in its
> header, so we should add license identifiers based on the copyright info
> provided by the initial comment block.
>
> Signed-off-by: Miko Larsson <[email protected]>
Looks good,
Reviewed-by: Christoph Hellwig <[email protected]>
On Fri, 2021-12-17 at 07:32 +0100, Miko Larsson wrote:
> zram_drv lacks an SPDX license identifier in both its source and in its
> header, so we should add license identifiers based on the copyright info
> provided by the initial comment block.
>
> Signed-off-by: Miko Larsson <[email protected]>
> ---
> drivers/block/zram/zram_drv.c | 9 ++-------
> drivers/block/zram/zram_drv.h | 9 ++-------
> 2 files changed, 4 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
[]
> @@ -1,15 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
GPL v2 is a permissive license and this SPDX tag should probably be
// SPDX-License-Identifier: GPL-2.0-or-later or BSD-3-Clause
> +
> /*
> * Compressed RAM block device
> *
> * Copyright (C) 2008, 2009, 2010 Nitin Gupta
> * 2012, 2013 Minchan Kim
> - *
> - * This code is released using a dual license strategy: BSD/GPL
> - * You can choose the licence that better fits your requirements.
> - *
> - * Released under the terms of 3-clause BSD License
> - * Released under the terms of GNU General Public License Version 2.0
On Tue, 2021-12-21 at 01:33 -0800, Joe Perches wrote:
> GPL v2 is a permissive license and this SPDX tag should probably be
>
> // SPDX-License-Identifier: GPL-2.0-or-later or BSD-3-Clause
It shouldn't be GPL-2.0-or-later, because the original copyright notice
doesn't have an "or later" clause.
(resending, original sent with an html part, unknown how)
On Fri, 2021-12-24 at 14:13 +0100, Miko Larsson wrote:
> On Tue, 2021-12-21 at 01:33 -0800, Joe Perches wrote:
> > GPL v2 is a permissive license and this SPDX tag should probably be
> >
> > // SPDX-License-Identifier: GPL-2.0-or-later or BSD-3-Clause
>
> It shouldn't be GPL-2.0-or-later, because the original copyright notice
> doesn't have an "or later" clause.
On its face, a GPL-2.0 license notice grant does _not_ need to
include any 'or later' content.
The GPL 2.0 license is permissive, it's at the _grantee's_ option.
I believe Nitin Gupta, the original author and submitter, should
declare whether or not he intended the license to include the
'or later' option.
Nitin?
Did you intend to use GPL-2.0 only and exclude GPL-3.0 or any later
version?