From: Mark Brown <broonie@kernel•org>
To: Eric Biggers <ebiggers@kernel•org>,
"Jason A. Donenfeld" <Jason@zx2c4•com>,
Ard Biesheuvel <ardb@kernel•org>,
Linux Crypto List <linux-crypto@vger•kernel.org>
Cc: Herbert Xu <herbert@gondor•apana.org.au>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the libcrypto tree with the crypto tree
Date: Fri, 17 Oct 2025 15:01:47 +0100 [thread overview]
Message-ID: <aPJMS2QN_Our8v2l@sirena.org.uk> (raw)
[-- 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 --]
next reply other threads:[~2025-10-17 14:01 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-17 14:01 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-11-24 3:35 linux-next: manual merge of the libcrypto tree with the crypto tree Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=aPJMS2QN_Our8v2l@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=Jason@zx2c4$(echo .)com \
--cc=ardb@kernel$(echo .)org \
--cc=ebiggers@kernel$(echo .)org \
--cc=herbert@gondor$(echo .)apana.org.au \
--cc=linux-crypto@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox