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/chacha_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 'crypto/chacha_generic.c')
| -rw-r--r-- | crypto/chacha_generic.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/crypto/chacha_generic.c b/crypto/chacha_generic.c index d2ec0499..04404c47 100644 --- a/crypto/chacha_generic.c +++ b/crypto/chacha_generic.c @@ -1,13 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * ChaCha and XChaCha stream ciphers, including ChaCha20 (RFC7539) * * Copyright (C) 2015 Martin Willi * Copyright (C) 2018 Google LLC - * - * 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> |