From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>,
Ingo Molnar <mingo@redhat•com>, "H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
Herbert Xu <herbert@gondor•apana.org.au>
Cc: Ingo Molnar <mingo@kernel•org>,
Linux Crypto List <linux-crypto@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Uros Bizjak <ubizjak@gmail•com>
Subject: linux-next: manual merge of the tip tree with the crypto tree
Date: Tue, 8 Apr 2025 11:28:30 +1000 [thread overview]
Message-ID: <20250408112830.4769244e@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1583 bytes --]
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/x86/Kconfig.assembler
between commits:
984f835009d6 ("crypto: x86 - Remove CONFIG_AS_SHA1_NI")
d032a27e8fe9 ("crypto: x86 - Remove CONFIG_AS_SHA256_NI")
from the crypto tree and commit:
a72d55dc3bd6 ("x86/idle: Remove CONFIG_AS_TPAUSE")
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.
--
Cheers,
Stephen Rothwell
diff --cc arch/x86/Kconfig.assembler
index 4d06fd3c8dfe,fa8858546d5e..000000000000
--- a/arch/x86/Kconfig.assembler
+++ b/arch/x86/Kconfig.assembler
@@@ -6,11 -6,16 +6,6 @@@ config AS_AVX51
help
Supported by binutils >= 2.25 and LLVM integrated assembler
- config AS_TPAUSE
- def_bool $(as-instr,tpause %ecx)
-config AS_SHA1_NI
- def_bool $(as-instr,sha1msg1 %xmm0$(comma)%xmm1)
-- help
- Supported by binutils >= 2.31.1 and LLVM integrated assembler >= V7
- Supported by binutils >= 2.24 and LLVM integrated assembler
-
-config AS_SHA256_NI
- def_bool $(as-instr,sha256msg1 %xmm0$(comma)%xmm1)
- help
- Supported by binutils >= 2.24 and LLVM integrated assembler
--
config AS_GFNI
def_bool $(as-instr,vgf2p8mulb %xmm0$(comma)%xmm1$(comma)%xmm2)
help
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-04-08 1:28 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-08 1:28 Stephen Rothwell [this message]
2025-04-08 6:35 ` linux-next: manual merge of the tip tree with the crypto tree Ingo Molnar
-- strict thread matches above, loose matches on Subject: below --
2026-01-07 2:07 Stephen Rothwell
2025-09-19 13:31 Mark Brown
2025-09-19 20:43 ` Borislav Petkov
2025-09-20 1:17 ` Herbert Xu
2025-09-20 10:01 ` Borislav Petkov
2022-11-28 1:29 Stephen Rothwell
2020-07-21 4:28 Stephen Rothwell
2020-08-03 22:14 ` Stephen Rothwell
2020-07-17 4:46 Stephen Rothwell
2020-07-17 6:27 ` Uros Bizjak
2020-07-17 6:44 ` Herbert Xu
2020-07-17 6:56 ` Stephen Rothwell
2020-07-17 7:31 ` Uros Bizjak
2020-07-20 4:03 ` Stephen Rothwell
2020-07-20 6:13 ` Uros Bizjak
2020-07-20 6:29 ` Stephen Rothwell
2020-07-20 11:59 ` Herbert Xu
2017-11-08 2:21 Stephen Rothwell
2015-10-12 3:24 Stephen Rothwell
2015-10-12 6:18 ` Herbert Xu
2015-06-17 3:21 Michael Ellerman
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=20250408112830.4769244e@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=herbert@gondor$(echo .)apana.org.au \
--cc=hpa@zytor$(echo .)com \
--cc=linux-crypto@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@kernel$(echo .)org \
--cc=mingo@redhat$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
--cc=ubizjak@gmail$(echo .)com \
/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