From: Miko Larsson <mikoxyzzz@gmail.com>
To: minchan@kernel.org, ngupta@vflare.org, senozhatsky@chromium.org,
axboe@kernel.dk, linux-kernel@vger.kernel.org,
linux-block@vger.kernel.org
Cc: Miko Larsson <mikoxyzzz@gmail.com>, hch@infradead.org
Subject: [PATCH v2 1/2] zram: zram_drv: add SPDX license identifiers
Date: Fri, 17 Dec 2021 07:32:23 +0100 [thread overview]
Message-ID: <20211217063224.3474-2-mikoxyzzz@gmail.com> (raw)
In-Reply-To: <20211217063224.3474-1-mikoxyzzz@gmail.com>
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 <mikoxyzzz@gmail.com>
---
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
next prev parent reply other threads:[~2021-12-17 6:32 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-17 6:32 [PATCH v2 0/2] Fix some formatting problems Miko Larsson
2021-12-17 6:32 ` Miko Larsson [this message]
2021-12-21 8:58 ` [PATCH v2 1/2] zram: zram_drv: add SPDX license identifiers Christoph Hellwig
2021-12-21 9:33 ` Joe Perches
2021-12-24 13:13 ` Miko Larsson
2021-12-24 16:33 ` Joe Perches
2021-12-17 6:32 ` [PATCH v2 2/2] zram: zram_drv: replace 'strlcpy()' Miko Larsson
2021-12-21 8:59 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211217063224.3474-2-mikoxyzzz@gmail.com \
--to=mikoxyzzz@gmail.com \
--cc=axboe@kernel.dk \
--cc=hch@infradead.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=minchan@kernel.org \
--cc=ngupta@vflare.org \
--cc=senozhatsky@chromium.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox