From: "Ondrej Mosnáček" <omosnacek@gmail.com>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: LKML <linux-kernel@vger.kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Kate Stewart <kstewart@linuxfoundation.org>,
Jonathan Corbet <corbet@lwn.net>,
Herbert Xu <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>,
linux-crypto@vger.kernel.org
Subject: Re: [patch 3/9] crypto: morus - Cleanup license mess
Date: Fri, 18 Jan 2019 09:00:20 +0100 [thread overview]
Message-ID: <CAAUqJDs6VoE-pTQ9Sk0eTV1+Z+20WFh3hxQTkNAxePkVZDgtpg@mail.gmail.com> (raw)
In-Reply-To: <20190117231501.068505479@linutronix.de>
pi 18. 1. 2019 o 0:15 Thomas Gleixner <tglx@linutronix.de> napísal(a):
> Precise and non-ambiguous license information is important. The recently
> added morus header files have a SPDX license identifier, which is nice, but
> at the same time they have a contradictionary license boiler plate text.
>
> SPDX-License-Identifier: GPL-2.0
>
> versus
>
> * This program is free software; you can redistribute it and/or modify it
> * under the terms of the GNU General Public License as published by the Free
> * Software Foundation; either version 2 of the License, or (at your option)
> * any later version
>
> Oh well.
>
> As the other morus related files are licensed under the GPL v2 or later,
> it's assumed that the boiler plate code is correct, but the SPDX license
> identifier is wrong.
>
> Fix the SPDX identifier and remove the boiler plate as it is redundant.
Thanks, I must have copy-pasted the bits from somewhere and didn't
notice the discrepancy...
>
> Fixes: 56e8e57fc3a7 ("crypto: morus - Add common SIMD glue code for MORUS")
> Fixes: 396be41f16fd ("crypto: morus - Add generic MORUS AEAD implementations")
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ondrej Mosnacek <omosnacek@gmail.com>
> Cc: Herbert Xu <herbert@gondor.apana.org.au>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: linux-crypto@vger.kernel.org
Acked-by: Ondrej Mosnacek <omosnacek@gmail.com>
(feel free to keep the ack also if you decide to switch to the "GPL-2.0+" form)
> ---
>
> P.S.: This patch is part of a larger cleanup, but independent of other
> patches and is intended to be picked up by the maintainer directly.
>
> ---
> ---
> include/crypto/morus1280_glue.h | 7 +------
> include/crypto/morus640_glue.h | 7 +------
> include/crypto/morus_common.h | 7 +------
> 3 files changed, 3 insertions(+), 18 deletions(-)
>
> --- a/include/crypto/morus1280_glue.h
> +++ b/include/crypto/morus1280_glue.h
> @@ -1,15 +1,10 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> /*
> * The MORUS-1280 Authenticated-Encryption Algorithm
> * Common glue skeleton -- header file
> *
> * Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com>
> * Copyright (C) 2017-2018 Red Hat, Inc. All rights reserved.
> - *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms of the GNU General Public License as published by the Free
> - * Software Foundation; either version 2 of the License, or (at your option)
> - * any later version.
> */
>
> #ifndef _CRYPTO_MORUS1280_GLUE_H
> --- a/include/crypto/morus640_glue.h
> +++ b/include/crypto/morus640_glue.h
> @@ -1,15 +1,10 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> /*
> * The MORUS-640 Authenticated-Encryption Algorithm
> * Common glue skeleton -- header file
> *
> * Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com>
> * Copyright (C) 2017-2018 Red Hat, Inc. All rights reserved.
> - *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms of the GNU General Public License as published by the Free
> - * Software Foundation; either version 2 of the License, or (at your option)
> - * any later version.
> */
>
> #ifndef _CRYPTO_MORUS640_GLUE_H
> --- a/include/crypto/morus_common.h
> +++ b/include/crypto/morus_common.h
> @@ -1,15 +1,10 @@
> -/* SPDX-License-Identifier: GPL-2.0 */
> +/* SPDX-License-Identifier: GPL-2.0-or-later */
> /*
> * The MORUS Authenticated-Encryption Algorithm
> * Common definitions
> *
> * Copyright (c) 2016-2018 Ondrej Mosnacek <omosnacek@gmail.com>
> * Copyright (C) 2017-2018 Red Hat, Inc. All rights reserved.
> - *
> - * This program is free software; you can redistribute it and/or modify it
> - * under the terms of the GNU General Public License as published by the Free
> - * Software Foundation; either version 2 of the License, or (at your option)
> - * any later version.
> */
>
> #ifndef _CRYPTO_MORUS_COMMON_H
>
>
next prev parent reply other threads:[~2019-01-18 8:00 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-17 23:14 [patch 0/9] treewide: Cleanup recently added license mess Thomas Gleixner
2019-01-17 23:14 ` [patch 1/9] block: Cleanup license notice Thomas Gleixner
2019-01-18 2:53 ` Bart Van Assche
2019-01-18 4:21 ` Jens Axboe
2019-01-17 23:14 ` [patch 2/9] crypto: aegis - Cleanup license mess Thomas Gleixner
2019-01-18 8:02 ` Ondrej Mosnáček
2019-01-25 10:47 ` Herbert Xu
2019-01-17 23:14 ` [patch 3/9] crypto: morus " Thomas Gleixner
2019-01-18 0:26 ` Fabio Estevam
2019-01-18 6:50 ` Greg Kroah-Hartman
2019-01-18 8:00 ` Ondrej Mosnáček [this message]
2019-01-17 23:14 ` [patch 4/9] crypto: aegis - Convert to SPDX license identifiers Thomas Gleixner
2019-01-18 8:01 ` Ondrej Mosnáček
2019-01-17 23:14 ` [patch 5/9] crypto: morus " Thomas Gleixner
2019-01-18 8:02 ` Ondrej Mosnáček
2019-01-17 23:14 ` [patch 6/9] ceph: quota: Cleanup license mess Thomas Gleixner
2019-01-18 9:42 ` Luis Henriques
2019-01-18 10:48 ` Ilya Dryomov
2019-01-18 10:54 ` Thomas Gleixner
2019-01-17 23:14 ` [patch 7/9] smb3: " Thomas Gleixner
2019-01-19 5:43 ` Steve French
2019-01-17 23:14 ` [patch 8/9] tools: bpftool: " Thomas Gleixner
2019-01-17 23:24 ` Jakub Kicinski
2019-01-18 0:00 ` Thomas Gleixner
2019-01-18 23:28 ` Alexei Starovoitov
2019-01-17 23:14 ` [patch 9/9] vfio/pci: " Thomas Gleixner
2019-01-23 20:05 ` Alex Williamson
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=CAAUqJDs6VoE-pTQ9Sk0eTV1+Z+20WFh3hxQTkNAxePkVZDgtpg@mail.gmail.com \
--to=omosnacek@gmail.com \
--cc=corbet@lwn.net \
--cc=davem@davemloft.net \
--cc=gregkh@linuxfoundation.org \
--cc=herbert@gondor.apana.org.au \
--cc=kstewart@linuxfoundation.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).