torvalds/linux
3
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-03-27 09:56:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2025-06-03 08:03:45 -07:00
parent 8b2198f037 b9802b54d4
commit 04446eee58
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/s390/lib/crypto/Makefile
View File

@@ -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

1
include/asm-generic/simd.h
View File

@@ -4,6 +4,7 @@
#include <linux/compiler_attributes.h>
#include <linux/preempt.h>
#include <linux/sched.h>
#include <linux/types.h>
/*