Merge tag 'v7.1-p5' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2d3090a8 · Linus Torvalds <[email protected]> · 2026-06-08 07:58:32 -07:00

Pull crypto fix from Herbert Xu:

 - Fix random config build failure on s390.

* tag 'v7.1-p5' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: s390 - add select CRYPTO_AEAD for aes

Commit: 2d3090a8aeb596a26935db0955d46c9a5db5c6ce
Parents: e92a7628 · ecf3edd3

Merge commit. Changes below are compared with the first parent: e92a7628.

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
arch/s390/crypto/Kconfig	modified	+1	−0	View file

arch/s390/crypto/Kconfig

View file

diff --git a/arch/s390/crypto/Kconfig b/arch/s390/crypto/Kconfig
index 00051d2..228570a 100644
--- a/arch/s390/crypto/Kconfig
+++ b/arch/s390/crypto/Kconfig
@@ -4,6 +4,7 @@ menu "Accelerated Cryptographic Algorithms for CPU (s390)"
 
 config CRYPTO_AES_S390
 	tristate "Ciphers: AES, modes: ECB, CBC, CTR, XTS, GCM"
+	select CRYPTO_AEAD
 	select CRYPTO_SKCIPHER
 	help
 	  AEAD cipher: AES with GCM