siphash: add SPDX tags as sole licensing authority
Subsystems (3)
Jason A. Donenfeld
maintainerPATCH 1/1 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.
--- include/linux/siphash.h | 5 ++--- lib/siphash.c | 5 ++--- lib/test_siphash.c | 7 +++---- 3 files changed, 7 insertions(+), 10 deletions(-)
include/linux/siphash.h +2 -3
@@ -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/
lib/siphash.c +2 -3
@@ -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/
lib/test_siphash.c +3 -4
@@ -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/
Signature · 1 line
2.35.1
Quoted 8 lines · Jason A. Donenfeld
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]>
Kate Stewart
Reviewed-byThanks for this bit of cleanup Jason! Much appreciated.
Quoted 8 lines · Thomas Gleixner
Quoted 6 lines · Jason A. Donenfeld
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.
Quoted 4 lines
Quoted 2 lines
Suggested-by Thomas Gleixner <[email protected]>Signed-off-by Jason A. Donenfeld <[email protected]>Reviewed-by Thomas Gleixner <[email protected]>
Quoted 11 lines · Kate Stewart
Thanks for this bit of cleanup Jason! Much appreciated.
Quoted 8 lines · Thomas Gleixner
Quoted 6 lines · Jason A. Donenfeld
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.
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Suggested-by Thomas Gleixner <[email protected]>Signed-off-by Jason A. Donenfeld <[email protected]>Reviewed-by Thomas Gleixner <[email protected]>Reviewed-by Kate Stewart <[email protected]>
Thanks all, I queued this up before the additional review comments, next time I'll be slower :)
greg k-h