Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Jason A. Donenfeld and committed by
Greg Kroah-Hartman
53c83d6d e0208351

+7 -10
+2 -3
include/linux/siphash.h
··· 1 - /* Copyright (C) 2016 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. 2 - * 3 - * This file is provided under a dual BSD/GPLv2 license. 1 + /* SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) */ 2 + /* Copyright (C) 2016-2022 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. 4 3 * 5 4 * SipHash: a fast short-input PRF 6 5 * https://131002.net/siphash/
+2 -3
lib/siphash.c
··· 1 - /* Copyright (C) 2016 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. 2 - * 3 - * This file is provided under a dual BSD/GPLv2 license. 1 + // SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) 2 + /* Copyright (C) 2016-2022 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. 4 3 * 5 4 * SipHash: a fast short-input PRF 6 5 * https://131002.net/siphash/
+3 -4
lib/test_siphash.c
··· 1 - /* Test cases for siphash.c 1 + // SPDX-License-Identifier: (GPL-2.0-only OR BSD-3-Clause) 2 + /* Copyright (C) 2016-2022 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. 2 3 * 3 - * Copyright (C) 2016 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved. 4 - * 5 - * This file is provided under a dual BSD/GPLv2 license. 4 + * Test cases for siphash.c 6 5 * 7 6 * SipHash: a fast short-input PRF 8 7 * https://131002.net/siphash/