| Message ID | 20221128122955.2f946b91@canb.auug.org.au |
|---|---|
| State | New |
| Headers | show |
| Series | linux-next: manual merge of the tip tree with the crypto tree | expand |
diff --cc arch/x86/crypto/sha1_ni_asm.S index 3cae5a1bb3d6,cd943b2af2c4..000000000000 --- a/arch/x86/crypto/sha1_ni_asm.S diff --cc arch/x86/crypto/sha256-avx-asm.S index 06ea30c20828,3649370690c5..000000000000 --- a/arch/x86/crypto/sha256-avx-asm.S diff --cc arch/x86/crypto/sha256-avx2-asm.S index 2d2be531a11e,c4c1dc5ee078..000000000000 --- a/arch/x86/crypto/sha256-avx2-asm.S diff --cc arch/x86/crypto/sha256-ssse3-asm.S index 7db28839108d,96b7dcdeaebe..000000000000 --- a/arch/x86/crypto/sha256-ssse3-asm.S diff --cc arch/x86/crypto/sha256_ni_asm.S index 47f93937f798,b3f1a1a12027..000000000000 --- a/arch/x86/crypto/sha256_ni_asm.S diff --cc arch/x86/crypto/sm3-avx-asm_64.S index 8fc5ac681fd6,b28d804ee10d..000000000000 --- a/arch/x86/crypto/sm3-avx-asm_64.S diff --cc arch/x86/crypto/sm4-aesni-avx-asm_64.S index 22b6560eb9e1,e13c8537b2ec..000000000000 --- a/arch/x86/crypto/sm4-aesni-avx-asm_64.S diff --cc arch/x86/crypto/sm4-aesni-avx2-asm_64.S index 23ee39a8ada8,2212705f7da6..000000000000 --- a/arch/x86/crypto/sm4-aesni-avx2-asm_64.S
Hi all, Today's linux-next merge of the tip tree got conflicts in: arch/x86/crypto/sha1_ni_asm.S arch/x86/crypto/sha256-avx-asm.S arch/x86/crypto/sha256-avx2-asm.S arch/x86/crypto/sha256-ssse3-asm.S arch/x86/crypto/sha256_ni_asm.S arch/x86/crypto/sm3-avx-asm_64.S arch/x86/crypto/sm4-aesni-avx-asm_64.S arch/x86/crypto/sm4-aesni-avx2-asm_64.S between commits: 32f34bf7e44e ("crypto: x86/sha1 - fix possible crash with CFI enabled") 19940ebbb59c ("crypto: x86/sha256 - fix possible crash with CFI enabled") 8ba490d9f5a5 ("crypto: x86/sm3 - fix possible crash with CFI enabled") 2d203c46a0fa ("crypto: x86/sm4 - fix crash with CFI enabled") from the crypto tree and commits: c2a3ce6fdb12 ("crypto: x86/sha1: Remove custom alignments") 3ba56d0b8711 ("crypto: x86/sha256: Remove custom alignments") 2f93238b87dd ("crypto: x86/sm[34]: Remove redundant alignments") from the tip 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.