Merge tag 'v6.16-p3' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

04446eee · Linus Torvalds <[email protected]> · 2025-06-03 08:03:45 -07:00

Pull crypto fixes from Herbert Xu:
 "Fix a loongarch header regression and a module name collision on s390"

* tag 'v6.16-p3' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  asm-generic: Add sched.h inclusion in simd.h
  crypto: s390/sha256 - rename module to sha256-s390

Commit: 04446eee58fcb2a6c9db5abff7f07cc2f38da9d0
Parents: 8b2198f0 · b9802b54

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

Changes

2 files changed · +3 −1

File	Status	Add	Del	Content
arch/s390/lib/crypto/Makefile	modified	+2	−1	View file
include/asm-generic/simd.h	modified	+1	−0	View file

arch/s390/lib/crypto/Makefile

View file

diff --git a/arch/s390/lib/crypto/Makefile b/arch/s390/lib/crypto/Makefile
index 9201979..5df30f1 100644
--- a/arch/s390/lib/crypto/Makefile
+++ b/arch/s390/lib/crypto/Makefile
@@ -3,4 +3,5 @@
 obj-$(CONFIG_CRYPTO_CHACHA_S390) += chacha_s390.o
 chacha_s390-y := chacha-glue.o chacha-s390.o
 
-obj-$(CONFIG_CRYPTO_SHA256_S390) += sha256.o
+obj-$(CONFIG_CRYPTO_SHA256_S390) += sha256-s390.o
+sha256-s390-y := sha256.o

include/asm-generic/simd.h

View file

diff --git a/include/asm-generic/simd.h b/include/asm-generic/simd.h
index ac29a22..70c8716 100644
--- a/include/asm-generic/simd.h
+++ b/include/asm-generic/simd.h
@@ -4,6 +4,7 @@
 
 #include <linux/compiler_attributes.h>
 #include <linux/preempt.h>
+#include <linux/sched.h>
 #include <linux/types.h>
 
 /*