[PATCH] siphash: add SPDX tags as sole licensing authority
"Jason A. Donenfeld" <[email protected]>
| Newsgroups | org.kernel.vger.linux-spdx,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
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 <[email protected]> Signed-off-by: Jason A. Donenfeld <[email protected]> --- include/linux/siphash.h | 5 ++--- lib/siphash.c | 5 ++--- 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 3af1428da559..9153e77382e1 100644 --- a/include/linux/siphash.h +++ b/include/linux/siphash.h @@ -1,6 +1,5 @@ -/* Copyright (C) 2016 Jason A. Donenfeld <[email protected]>. 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 <[email protected]>. All Rights Reserved. * * SipHash: a fast short-input PRF * https://131002.net/siphash/ diff --git a/lib/siphash.c b/lib/siphash.c index 71d315a6ad62..15bc5b6f368c 100644 --- a/lib/siphash.c +++ b/lib/siphash.c @@ -1,6 +1,5 @@ -/* Copyright (C) 2016 Jason A. Donenfeld <[email protected]>. 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 <[email protected]>. 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 <[email protected]>. All Rights Reserved. * - * Copyright (C) 2016 Jason A. Donenfeld <[email protected]>. 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/ -- 2.35.1