This is a note to let you know that I've just added the patch titled crypto: blake2s - adjust include guard naming to the 5.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: crypto-blake2s-adjust-include-guard-naming.patch and it can be found in the queue-5.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From foo@baz Fri Jun 17 09:02:32 AM CEST 2022 From: Eric Biggers <ebiggers@xxxxxxxxxx> Date: Wed, 23 Dec 2020 00:09:57 -0800 Subject: crypto: blake2s - adjust include guard naming From: Eric Biggers <ebiggers@xxxxxxxxxx> commit 8786841bc2020f7f2513a6c74e64912f07b9c0dc upstream. Use the full path in the include guards for the BLAKE2s headers to avoid ambiguity and to match the convention for most files in include/crypto/. Signed-off-by: Eric Biggers <ebiggers@xxxxxxxxxx> Acked-by: Ard Biesheuvel <ardb@xxxxxxxxxx> Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Jason A. Donenfeld <Jason@xxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- include/crypto/blake2s.h | 6 +++--- include/crypto/internal/blake2s.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) --- a/include/crypto/blake2s.h +++ b/include/crypto/blake2s.h @@ -3,8 +3,8 @@ * Copyright (C) 2015-2019 Jason A. Donenfeld <Jason@xxxxxxxxx>. All Rights Reserved. */ -#ifndef BLAKE2S_H -#define BLAKE2S_H +#ifndef _CRYPTO_BLAKE2S_H +#define _CRYPTO_BLAKE2S_H #include <linux/bug.h> #include <linux/types.h> @@ -99,4 +99,4 @@ static inline void blake2s(u8 *out, cons blake2s_final(&state, out); } -#endif /* BLAKE2S_H */ +#endif /* _CRYPTO_BLAKE2S_H */ --- a/include/crypto/internal/blake2s.h +++ b/include/crypto/internal/blake2s.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 OR MIT */ -#ifndef BLAKE2S_INTERNAL_H -#define BLAKE2S_INTERNAL_H +#ifndef _CRYPTO_INTERNAL_BLAKE2S_H +#define _CRYPTO_INTERNAL_BLAKE2S_H #include <crypto/blake2s.h> @@ -16,4 +16,4 @@ static inline void blake2s_set_lastblock state->f[0] = -1; } -#endif /* BLAKE2S_INTERNAL_H */ +#endif /* _CRYPTO_INTERNAL_BLAKE2S_H */ Patches currently in stable-queue which might be from ebiggers@xxxxxxxxxx are queue-5.4/random-do-not-take-pool-spinlock-at-boot.patch queue-5.4/random-introduce-drain_entropy-helper-to-declutter-crng_reseed.patch queue-5.4/random-fix-locking-in-crng_fast_load.patch queue-5.4/random-group-userspace-read-write-functions.patch queue-5.4/random-make-credit_entropy_bits-always-safe.patch queue-5.4/random-pull-add_hwgenerator_randomness-declaration-into-random.h.patch queue-5.4/random-unify-early-init-crng-load-accounting.patch queue-5.4/random-use-blake2s-instead-of-sha1-in-extraction.patch queue-5.4/random-initialize-chacha20-constants-with-correct-endianness.patch queue-5.4/random-group-entropy-extraction-functions.patch queue-5.4/random-rewrite-header-introductory-comment.patch queue-5.4/random-remove-ifdef-d-out-interrupt-bench.patch queue-5.4/random-tie-batched-entropy-generation-to-base_crng-generation.patch queue-5.4/random-use-linear-min-entropy-accumulation-crediting.patch queue-5.4/random-use-simpler-fast-key-erasure-flow-on-per-cpu-keys.patch queue-5.4/random-remove-batched-entropy-locking.patch queue-5.4/random-inline-leaves-of-rand_initialize.patch queue-5.4/random-remove-use_input_pool-parameter-from-crng_reseed.patch queue-5.4/random-fix-locking-for-crng_init-in-crng_reseed.patch queue-5.4/random-zero-buffer-after-reading-entropy-from-userspace.patch queue-5.4/random-remove-whitespace-and-reorder-includes.patch queue-5.4/random-simplify-entropy-debiting.patch queue-5.4/random-make-more-consistent-use-of-integer-types.patch queue-5.4/random-document-crng_fast_key_erasure-destination-possibility.patch queue-5.4/random-absorb-fast-pool-into-input-pool-after-fast-load.patch queue-5.4/random-use-rdseed-instead-of-rdrand-in-entropy-extraction.patch queue-5.4/random-remove-dead-code-left-over-from-blocking-pool.patch queue-5.4/random-use-computational-hash-for-entropy-extraction.patch queue-5.4/random-always-wake-up-entropy-writers-after-extraction.patch queue-5.4/random-do-not-xor-rdrand-when-writing-into-dev-random.patch queue-5.4/random-group-initialization-wait-functions.patch queue-5.4/random-remove-unused-tracepoints.patch queue-5.4/random-check-for-crng_init-0-in-add_device_randomness.patch queue-5.4/crypto-blake2s-include-linux-bug.h-instead-of-asm-bug.h.patch queue-5.4/random-group-entropy-collection-functions.patch queue-5.4/random-remove-useless-header-comment.patch queue-5.4/random-remove-outdated-int_max-6-check-in-urandom_read.patch queue-5.4/random-do-not-pretend-to-handle-premature-next-security-model.patch queue-5.4/random-avoid-arch_get_random_seed_long-when-collecting-irq-randomness.patch queue-5.4/random-reseed-more-often-immediately-after-booting.patch queue-5.4/random-ensure-early-rdseed-goes-through-mixer-on-init.patch queue-5.4/random-get-rid-of-secondary-crngs.patch queue-5.4/crypto-blake2s-adjust-include-guard-naming.patch queue-5.4/random-group-crng-functions.patch queue-5.4/random-use-hash-function-for-crng_slow_load.patch