diff options
| author | Jason A. Donenfeld <Jason@zx2c4.com> | 2022-05-18 15:23:45 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2022-05-19 18:54:22 +0200 |
| commit | 53c83d6d8e399fad3d3d25df0ea0d54eb0f94f88 (patch) | |
| tree | 2dccb764d8e45d5ac390fb8bfcc71ab775c4bdfe | |
| parent | e0208351383c19e62f5f04209ce4ecf24db64eaf (diff) | |
| download | linux-stable-53c83d6d8e399fad3d3d25df0ea0d54eb0f94f88.tar.gz linux-stable-53c83d6d8e399fad3d3d25df0ea0d54eb0f94f88.tar.bz2 linux-stable-53c83d6d8e399fad3d3d25df0ea0d54eb0f94f88.zip | |
siphash: add SPDX tags as sole licensing authority
The text "dual BSD/GPLv2 license" is somewhat ambiguous, and moving this
over to SPDX is overdue. This commit adds SPDX tags to the relevant
files and clarifies that it's GPLv2 only and 3-clause BSD. It also
removes the old text, so that the SPDX tags are the only source of the
information.
Suggested-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | include/linux/siphash.h | 5 | ||||
| -rw-r--r-- | lib/siphash.c | 5 | ||||
| -rw-r--r-- | lib/test_siphash.c | 7 |
3 files changed, 7 insertions, 10 deletions
diff --git a/include/linux/siphash.h b/include/linux/siphash.h index cce8a9acc76c..9e822311b29e 100644 --- a/include/linux/siphash.h +++ b/include/linux/siphash.h @@ -1,6 +1,5 @@ -/* Copyright (C) 2016 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. - * - * This file is provided under a dual BSD/GPLv2 license. +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) */ +/* Copyright (C) 2016-2022 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. * * SipHash: a fast short-input PRF * https://131002.net/siphash/ diff --git a/lib/siphash.c b/lib/siphash.c index 72b9068ab57b..f08fd988173b 100644 --- a/lib/siphash.c +++ b/lib/siphash.c @@ -1,6 +1,5 @@ -/* Copyright (C) 2016 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. - * - * This file is provided under a dual BSD/GPLv2 license. +// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) +/* Copyright (C) 2016-2022 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. * * SipHash: a fast short-input PRF * https://131002.net/siphash/ diff --git a/lib/test_siphash.c b/lib/test_siphash.c index a6d854d933bf..a96788d0141d 100644 --- a/lib/test_siphash.c +++ b/lib/test_siphash.c @@ -1,8 +1,7 @@ -/* Test cases for siphash.c +// SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) +/* Copyright (C) 2016-2022 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. * - * Copyright (C) 2016 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. - * - * This file is provided under a dual BSD/GPLv2 license. + * Test cases for siphash.c * * SipHash: a fast short-input PRF * https://131002.net/siphash/ |