This push fixes a loongarch header regression and a module name

collision on s390.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEn51F/lCuNhUwmDeSxycdCkmxi6cFAmg+ZMUACgkQxycdCkmx
 i6em9g/+N8dyx6m0V03ziL1pFYlUH5uJMxendmi7NNhzsHVj24wfY4mn8m2Aum+F
 avUUv7UkDm1Tdx+lNedz8lhGdZ8Xmtl0dnrsZmpLN7gxzkojIuCAQXmazCTYpxRR
 w4tC/ucnuerdAzki6P2chjAIbdvqYGSHqFeFwjmr9+hwtAyd69ZOtDa4xz6bHVZP
 /UilKvLY4LwJyoSJ86vffHzcj7FmzHGxOAXtDJxKBj+dvzFCnKgsx2lT04fG17xQ
 0hHUwUpJS2YhnPBJTJE2wWq9NTSnQSKG3Ny6rdGJ+e78uGRqavA/AB15xT0DddrC
 7yG7dQUVmCITmQCYlIJUQ4EhDj5tPcNdfwsWzgv30RO4zgrogQNALU0UbTPDey9H
 NWKHvfbOoKjuQeP8SdK5C0moR6z4Sqyt0j9xASIP+VSgRau8szkoURooj6w+79Am
 F1S7+h7CIczy2u+alQcqLMqO/8RL0ZuFok9c3Dz+5jEz1hnlzCugNc1Hk+MRdsev
 xPOKuXLxBRDdeKH8+8JsWInZ/KrZEe5Vy3Op7Oh026t2lG3oUq9IHOttQKP0dWbU
 PKcKam1pDBS6uIBbQWqkLQutRnH6D7ZWuO66Btes0CUkLuDNO1v7J+xQlkY6KT3v
 AhECPCsDafY0vmbBliP3e6nTTJASXFHMDp8+p+Kn2YT4EAhgKVI=
 =/nNB
 -----END PGP SIGNATURE-----

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

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
commit 04446eee58
2 changed files with 3 additions and 1 deletions

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

View File

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