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

ad615908 · Linus Torvalds <[email protected]> · 2025-06-13 09:59:29 -07:00

Pull crypto fix from Herbert Xu:
 "Fix a broken self-test in hkdf (new regression)"

* tag 'v6.16-p4' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: hkdf - move to late_initcall

Commit: ad6159087fbbd754bfe940bd62b6322307925faa
Parents: 36df6f73 · 40a98e70

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

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
crypto/hkdf.c	modified	+1	−1	View file

crypto/hkdf.c

View file

diff --git a/crypto/hkdf.c b/crypto/hkdf.c
index f24c2a8..82d1b32 100644
--- a/crypto/hkdf.c
+++ b/crypto/hkdf.c
@@ -566,7 +566,7 @@ static int __init crypto_hkdf_module_init(void)
 
 static void __exit crypto_hkdf_module_exit(void) {}
 
-module_init(crypto_hkdf_module_init);
+late_initcall(crypto_hkdf_module_init);
 module_exit(crypto_hkdf_module_exit);
 
 MODULE_LICENSE("GPL");