Linux-mm Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/2] zsmalloc: fix SPDX license identifier
@ 2026-11-19  4:13 Sergey Senozhatsky
  2026-11-19  4:13 ` [PATCH 2/2] zram: use " Sergey Senozhatsky
  2026-11-19  4:29 ` [PATCH 1/2] zsmalloc: fix " Sergey Senozhatsky
  0 siblings, 2 replies; 3+ messages in thread
From: Sergey Senozhatsky @ 2026-11-19  4:13 UTC (permalink / raw)
  To: Andrew Morton
  Cc: Minchan Kim, linux-kernel, linux-block, linux-mm,
	Sergey Senozhatsky

zsmalloc is released under MODULE_LICENSE("Dual BSD/GPL") so
the existing SPDX license identifier is incorrect.

Use the matching identifier, (GPL-2.0-only OR BSD-3-Clause),
and drop the license text that it replaces.  The copyright
notices stay as they are.

Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
---
 include/linux/zsmalloc.h | 7 +------
 mm/zsmalloc.c            | 8 +-------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/include/linux/zsmalloc.h b/include/linux/zsmalloc.h
index 8971eef333ba..3232bc9c33b2 100644
--- a/include/linux/zsmalloc.h
+++ b/include/linux/zsmalloc.h
@@ -1,14 +1,9 @@
+/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) */
 /*
  * zsmalloc memory allocator
  *
  * Copyright (C) 2011  Nitin Gupta
  * Copyright (C) 2012, 2013 Minchan Kim
- *
- * This code is released using a dual license strategy: BSD/GPL
- * You can choose the license 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 _ZS_MALLOC_H_
diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index 4a6ec43f418b..f571b3c9e9ca 100644
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -1,16 +1,10 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
+// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)
 
 /*
  * zsmalloc memory allocator
  *
  * Copyright (C) 2011  Nitin Gupta
  * Copyright (C) 2012, 2013 Minchan Kim
- *
- * This code is released using a dual license strategy: BSD/GPL
- * You can choose the license 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 pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-- 
2.56.1.708.g77570a6a1d-goog



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [PATCH 2/2] zram: use SPDX license identifier
  2026-11-19  4:13 [PATCH 1/2] zsmalloc: fix SPDX license identifier Sergey Senozhatsky
@ 2026-11-19  4:13 ` Sergey Senozhatsky
  2026-11-19  4:29 ` [PATCH 1/2] zsmalloc: fix " Sergey Senozhatsky
  1 sibling, 0 replies; 3+ messages in thread
From: Sergey Senozhatsky @ 2026-11-19  4:13 UTC (permalink / raw)
  To: Andrew Morton
  Cc: Minchan Kim, linux-kernel, linux-block, linux-mm,
	Sergey Senozhatsky

Replace the license text with the matching SPDX identifier,
(GPL-2.0-only OR BSD-3-Clause).  The copyright notices stay
as they are.

Signed-off-by: Sergey Senozhatsky <senozhatsky@chromium.org>
---
 drivers/block/zram/zram_drv.c | 8 +-------
 drivers/block/zram/zram_drv.h | 8 +-------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 946b625761f8..90f06523bb8b 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -1,15 +1,9 @@
+// SPDX-License-Identifier: (GPL-2.0-only 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 pr_fmt(fmt) "zram: " fmt
diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h
index d64c99b74214..724f8ce6709b 100644
--- a/drivers/block/zram/zram_drv.h
+++ b/drivers/block/zram/zram_drv.h
@@ -1,15 +1,9 @@
+/* SPDX-License-Identifier: (GPL-2.0-only 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.56.1.708.g77570a6a1d-goog



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH 1/2] zsmalloc: fix SPDX license identifier
  2026-11-19  4:13 [PATCH 1/2] zsmalloc: fix SPDX license identifier Sergey Senozhatsky
  2026-11-19  4:13 ` [PATCH 2/2] zram: use " Sergey Senozhatsky
@ 2026-11-19  4:29 ` Sergey Senozhatsky
  1 sibling, 0 replies; 3+ messages in thread
From: Sergey Senozhatsky @ 2026-11-19  4:29 UTC (permalink / raw)
  To: Sergey Senozhatsky
  Cc: Andrew Morton, Minchan Kim, linux-kernel, linux-block, linux-mm

On (26/11/19 13:13), Sergey Senozhatsky wrote:
[..]
> +++ b/mm/zsmalloc.c
> @@ -1,16 +1,10 @@
> -// SPDX-License-Identifier: GPL-2.0-or-later
> +// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause)

So this was introduced by commit 91d0ec834786 ("replace kmap_atomic
with kmap_local_page").  It doesn't look like I have reviewed that
patch [1].  Somehow.  It would have been difficult to spot that
SPDX one-liner among all the kmap changes anyway.

[1] https://lkml.kernel.org/r/20241001175358.12970-1-quic_pintu@quicinc.com


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2026-11-19  4:29 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-19  4:13 [PATCH 1/2] zsmalloc: fix SPDX license identifier Sergey Senozhatsky
2026-11-19  4:13 ` [PATCH 2/2] zram: use " Sergey Senozhatsky
2026-11-19  4:29 ` [PATCH 1/2] zsmalloc: fix " Sergey Senozhatsky

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox