2019-01-17 23:15:26

by Thomas Gleixner

[permalink] [raw]
Subject: [patch 5/9] crypto: morus - Convert to SPDX license identifiers

The license boiler plate text is not ideal for machine parsing. The kernel
uses SPDX license identifiers for that purpose, which replace the boiler
plate text.

Signed-off-by: Thomas Gleixner <[email protected]>
Cc: Ondrej Mosnacek <[email protected]>
Cc: Herbert Xu <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: [email protected]
---

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.

---
crypto/morus1280.c | 6 +-----
crypto/morus640.c | 6 +-----
2 files changed, 2 insertions(+), 10 deletions(-)

--- a/crypto/morus1280.c
+++ b/crypto/morus1280.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* The MORUS-1280 Authenticated-Encryption Algorithm
*
* Copyright (c) 2016-2018 Ondrej Mosnacek <[email protected]>
* 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.
*/

#include <asm/unaligned.h>
--- a/crypto/morus640.c
+++ b/crypto/morus640.c
@@ -1,13 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* The MORUS-640 Authenticated-Encryption Algorithm
*
* Copyright (c) 2016-2018 Ondrej Mosnacek <[email protected]>
* 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.
*/

#include <asm/unaligned.h>


2019-01-18 08:02:19

by Ondrej Mosnáček

[permalink] [raw]
Subject: Re: [patch 5/9] crypto: morus - Convert to SPDX license identifiers

pi 18. 1. 2019 o 0:15 Thomas Gleixner <[email protected]> napísal(a):
> The license boiler plate text is not ideal for machine parsing. The kernel
> uses SPDX license identifiers for that purpose, which replace the boiler
> plate text.
>
> Signed-off-by: Thomas Gleixner <[email protected]>
> Cc: Ondrej Mosnacek <[email protected]>
> Cc: Herbert Xu <[email protected]>
> Cc: "David S. Miller" <[email protected]>
> Cc: [email protected]

Acked-by: Ondrej Mosnacek <[email protected]>
(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.
>
> ---
> crypto/morus1280.c | 6 +-----
> crypto/morus640.c | 6 +-----
> 2 files changed, 2 insertions(+), 10 deletions(-)
>
> --- a/crypto/morus1280.c
> +++ b/crypto/morus1280.c
> @@ -1,13 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> * The MORUS-1280 Authenticated-Encryption Algorithm
> *
> * Copyright (c) 2016-2018 Ondrej Mosnacek <[email protected]>
> * 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.
> */
>
> #include <asm/unaligned.h>
> --- a/crypto/morus640.c
> +++ b/crypto/morus640.c
> @@ -1,13 +1,9 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> /*
> * The MORUS-640 Authenticated-Encryption Algorithm
> *
> * Copyright (c) 2016-2018 Ondrej Mosnacek <[email protected]>
> * 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.
> */
>
> #include <asm/unaligned.h>
>
>