From: Ingo Molnar <mingo@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: 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>,
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: Re: linux-next: manual merge of the tip tree with the crypto tree
Date: Tue, 8 Apr 2025 08:35:46 +0200 [thread overview]
Message-ID: <Z_TDwj7cxauy0gQu@gmail.com> (raw)
In-Reply-To: <20250408112830.4769244e@canb.auug.org.au>
* Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 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.
The resolution looks good to me, thank you!
Ingo
next prev parent reply other threads:[~2025-04-08 6:35 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-08 1:28 linux-next: manual merge of the tip tree with the crypto tree Stephen Rothwell
2025-04-08 6:35 ` Ingo Molnar [this message]
-- 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=Z_TDwj7cxauy0gQu@gmail.com \
--to=mingo@kernel.org \
--cc=herbert@gondor.apana.org.au \
--cc=hpa@zytor.com \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
--cc=ubizjak@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.