* linux-next: manual merge of the libcrypto tree with the crypto tree
@ 2025-10-17 14:01 Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2025-10-17 14:01 UTC (permalink / raw)
To: Eric Biggers, Jason A. Donenfeld, Ard Biesheuvel,
Linux Crypto List
Cc: Herbert Xu, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1585 bytes --]
Hi all,
Today's linux-next merge of the libcrypto tree got a conflict in:
arch/x86/crypto/aes-gcm-vaes-avx2.S
between commits:
f6c31b7871903 ("crypto: x86/aes-gcm - add VAES+AVX2 optimized code")
d4acd8519d2ad ("crypto: x86/aes-gcm - rename avx10 and avx10_512 to avx512")
from the crypto tree and commits:
ae40f6df72d10 ("crypto: x86/aes-gcm - add VAES+AVX2 optimized code")
9bc4bcca89e45 ("crypto: x86/aes-gcm - rename avx10 and avx10_512 to avx512")
from the libcrypto tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
(I'm not very confident of this resolution which was a bit bigger than
it looks from the diff below, I've no real idea about x86 assembly)
diff --cc arch/x86/crypto/aes-gcm-vaes-avx2.S
index 5ccbd85383cdd,d9754e683bde3..0000000000000
--- a/arch/x86/crypto/aes-gcm-vaes-avx2.S
+++ b/arch/x86/crypto/aes-gcm-vaes-avx2.S
@@@ -689,7 -687,7 +688,8 @@@ SYM_FUNC_END(aes_gcm_aad_update_vaes_av
.set LE_CTR_PTR32, %esi
.set GHASH_ACC_PTR, %rdx
.set SRC, %rcx // Assumed to be %rcx.
+ // See .Ltail_xor_and_ghash_partial_vec
+ // See .Ltail_xor_and_ghash_1to16bytes
.set DST, %r8
.set DATALEN, %r9d
.set DATALEN64, %r9 // Zero-extend DATALEN before using!
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* linux-next: manual merge of the libcrypto tree with the crypto tree
@ 2025-11-24 3:35 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2025-11-24 3:35 UTC (permalink / raw)
To: Eric Biggers, Jason A. Donenfeld, Ard Biesheuvel, Herbert Xu
Cc: Linux Crypto List, Linux Kernel Mailing List,
Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 1323 bytes --]
Hi all,
Today's linux-next merge of the libcrypto tree got a conflict in:
arch/arm64/configs/defconfig
between commit:
c7dcb041ce7d ("crypto: ansi_cprng - Remove unused ansi_cprng algorithm")
from the crypto tree and commit:
1e29a750572a ("lib/crypto: arm64/sha3: Migrate optimized code into library")
from the libcrypto tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/arm64/configs/defconfig
index ea054634d157,20dd3a39faea..000000000000
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -1868,9 -1783,10 +1868,9 @@@ CONFIG_CRYPTO_CHACHA20=
CONFIG_CRYPTO_BENCHMARK=m
CONFIG_CRYPTO_ECHAINIV=y
CONFIG_CRYPTO_MICHAEL_MIC=m
+ CONFIG_CRYPTO_SHA3=m
-CONFIG_CRYPTO_ANSI_CPRNG=y
CONFIG_CRYPTO_USER_API_RNG=m
CONFIG_CRYPTO_GHASH_ARM64_CE=y
- CONFIG_CRYPTO_SHA3_ARM64=m
CONFIG_CRYPTO_SM3_ARM64_CE=m
CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
CONFIG_CRYPTO_AES_ARM64_BS=m
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-11-24 3:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-10-17 14:01 linux-next: manual merge of the libcrypto tree with the crypto tree Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2025-11-24 3:35 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox