diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2019-06-22 11:16:25 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2019-06-22 11:16:25 +0200 |
commit | dbe02bf7c56e55a5d9ef542dc3cf4cfc12f3017c (patch) | |
tree | 9d316a6f7ed462d132786f074da835b8ff1f7196 /crypto/cast5_generic.c | |
parent | 8dab4355510edce56ef3bb8e0f209b9d8dfe17b8 (diff) | |
parent | a84aadf66a5970b4ada37b58f16c50dd797f2935 (diff) | |
download | linux-crypto-dbe02bf7c56e55a5d9ef542dc3cf4cfc12f3017c.tar.gz linux-crypto-dbe02bf7c56e55a5d9ef542dc3cf4cfc12f3017c.zip |
Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgent
Pull another handful of EFI fixes for v5.2 from Arnd:
- Fix a potential crash after kexec on arm64 with GICv3
- Fix a build warning on x86
- Stop policing the BGRT feature flags
- Use a non-blocking version of SetVariable() in the boot control driver
Diffstat (limited to '')
-rw-r--r-- | crypto/cast5_generic.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/crypto/cast5_generic.c b/crypto/cast5_generic.c index 24bc7d4e..4095085d 100644 --- a/crypto/cast5_generic.c +++ b/crypto/cast5_generic.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* Kernel cryptographic api. * cast5.c - Cast5 cipher algorithm (rfc2144). * @@ -9,14 +10,6 @@ * * Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. * Copyright (C) 2003 Kartikey Mahendra Bhatt <kartik_me@hotmail.com>. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of GNU General Public License as published by the Free -* Software Foundation; either version 2 of the License, or (at your option) -* any later version. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see <http://www.gnu.org/licenses/>. */ |