From patchwork Mon Nov 28 01:29:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 629028 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 33399C4332F for ; Mon, 28 Nov 2022 01:30:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229515AbiK1BaF (ORCPT ); Sun, 27 Nov 2022 20:30:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45418 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229475AbiK1BaE (ORCPT ); Sun, 27 Nov 2022 20:30:04 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BED70A45A; Sun, 27 Nov 2022 17:30:02 -0800 (PST) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4NL7F03kRbz4x7X; Mon, 28 Nov 2022 12:29:56 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1669598997; bh=ZRRd6Gk8NWLzfHY82OUx4YCkMM3vE3XCFIJ8nTVL9TY=; h=Date:From:To:Cc:Subject:From; b=cS+hEbvSamFGFXQYcxoSOG7KKcbDzq4/3Owjw72mEtzEzmf9AT9+VG7C86mfK01hn hIAGAbDmlpuqFqmevr/rMrpfwAkPhiIg4oPhR4wlsze1CC/2pGjJIM07yzW0VYWJka bk+3l3ragKov1J8uICwP5sqifWX8QQT/vgcsjUb+FvHI3rOD53VQSEHXDAzaoGfH0k pVJoV9JQ1mRf0Iaz8l1n0fcWRk267Yh6f+j1g5v2+Ppzf1BI+zRuR5x1vE+DlaGGbs 51O5JNUVvnuWbX7i3WHwTgP/DjD7NoifNoqo94lr0QiAY7U38UHAX9uJWnJB/NrAtv xEId8sqGQADuw== Date: Mon, 28 Nov 2022 12:29:55 +1100 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Herbert Xu Cc: Linux Crypto List , Eric Biggers , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the tip tree with the crypto tree Message-ID: <20221128122955.2f946b91@canb.auug.org.au> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org 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. 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